Merge branch 'master' into sanity-uptime

.travis.yml

@@ -1,33 +0,0 @@
-# http://docs.travis-ci.com/user/languages/go/
-language: go
-
-go:
-  - "1.12.x"
-
-os:
-  - linux
-
-services:
-  - mysql
-
-env:
-- MYSQL_USER=root
-- CURRENT_CI_ENV=travis
-
-addons:
-  apt:
-    packages:
-    - git
-    - numactl
-    - libaio1
-
-before_install:
-  - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
-
-install: true
-
-script:
-  - script/cibuild
-
-notifications:
-  email: false

localtests/swap-uk-uk/create.sql

@@ -1,8 +1,8 @@
 drop table if exists gh_ost_test;
 create table gh_ost_test (
-  id bigint,
+  id bigint not null,
   i int not null,
-  ts timestamp(6),
+  ts timestamp(6) not null,
   unique key id_uidx(id),
   unique key its_uidx(i, ts)
 ) ;

script/cibuild-gh-ost-replica-tests

@@ -50,7 +50,8 @@ test_mysql_version() {
 
   export PATH="${PWD}/gh-ost-ci-env/bin/:${PATH}"
 
-  gh-ost-test-mysql-master -uroot -e "grant all on *.* to 'gh-ost'@'%' identified by 'gh-ost'"
+  gh-ost-test-mysql-master -uroot -e "create user 'gh-ost'@'%' identified by 'gh-ost'"
+  gh-ost-test-mysql-master -uroot -e "grant all on *.* to 'gh-ost'@'%'"
 
   echo "### Running gh-ost tests for $mysql_version"
   ./localtests/test.sh -b bin/gh-ost
@@ -61,6 +62,9 @@ test_mysql_version() {
 echo "Building..."
 . script/build
 # Test all versions:
+find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.gz" | while read f ; do basename $f ".tar.gz" ; done | sort -r | while read mysql_version ; do
+  echo "found MySQL version: $mysql_version"
+done
 find gh-ost-ci-env/mysql-tarballs/ -name "*.tar.gz" | while read f ; do basename $f ".tar.gz" ; done | sort -r | while read mysql_version ; do
   test_mysql_version "$mysql_version"
 done