Merge remote-tracking branch 'origin/master' into binlog_insert_column_lookup_issue

doc/command-line-flags.md

@@ -98,4 +98,4 @@ See `approve-renamed-columns`
 
 ### test-on-replica
 
-Issue the migration on a replica; do not modify data on master. Useful for validating, testing and benchmarking. See [test-on-replica](test-on-replica.md)
+Issue the migration on a replica; do not modify data on master. Useful for validating, testing and benchmarking. See [testing-on-replica](testing-on-replica.md)

doc/requirements-and-limitations.md

@@ -2,7 +2,7 @@
 
 ### Requirements
 
-- You will need to have one server serving Row Based Replication (RBR) format binary logs. Right now `FULL` row image is supported. `MINIMAL` to be supported in the near future. `gh-ost` prefers to work with replicas. You may [still have your master configured with Statement Based Replication](migrating-with-sbr) (SBR).
+- You will need to have one server serving Row Based Replication (RBR) format binary logs. Right now `FULL` row image is supported. `MINIMAL` to be supported in the near future. `gh-ost` prefers to work with replicas. You may [still have your master configured with Statement Based Replication](migrating-with-sbr.md) (SBR).
 
 - `gh-ost` requires an account with these privileges:
 

localtests/rename-reorder-column/create.sql

@@ -0,0 +1,26 @@
+drop table if exists gh_ost_test;
+create table gh_ost_test (
+  id int auto_increment,
+  c1 int not null,
+  c2 int not null,
+  primary key (id)
+) auto_increment=1;
+
+drop event if exists gh_ost_test;
+delimiter ;;
+create event gh_ost_test
+  on schedule every 1 second
+  starts current_timestamp
+  ends current_timestamp + interval 60 second
+  on completion not preserve
+  enable
+  do
+begin
+  insert ignore into gh_ost_test values (1, 11, 23);
+  insert ignore into gh_ost_test values (2, 13, 23);
+  insert into gh_ost_test values (null, 17, 23);
+  set @last_insert_id := last_insert_id();
+  update gh_ost_test set c1=c1+@last_insert_id, c2=c2+@last_insert_id where id=@last_insert_id order by id desc limit 1;
+  delete from gh_ost_test where id=1;
+  delete from gh_ost_test where c1=13; -- id=2
+end ;;

localtests/rename-reorder-column/extra_args

@@ -0,0 +1 @@
+--alter="change column c2 c2a int not null after id" --approve-renamed-columns

localtests/rename-reorder-column/ghost_columns

@@ -0,0 +1 @@
+id, c1, c2a

localtests/rename-reorder-column/orig_columns

@@ -0,0 +1 @@
+id, c1, c2

localtests/rename-reorder-columns/create.sql

@@ -0,0 +1,27 @@
+drop table if exists gh_ost_test;
+create table gh_ost_test (
+  id int auto_increment,
+  c1 int not null,
+  c2 int not null,
+  c3 int not null,
+  primary key (id)
+) auto_increment=1;
+
+drop event if exists gh_ost_test;
+delimiter ;;
+create event gh_ost_test
+  on schedule every 1 second
+  starts current_timestamp
+  ends current_timestamp + interval 60 second
+  on completion not preserve
+  enable
+  do
+begin
+  insert ignore into gh_ost_test values (1, 11, 23, 97);
+  insert ignore into gh_ost_test values (2, 13, 27, 61);
+  insert into gh_ost_test values (null, 17, 31, 53);
+  set @last_insert_id := last_insert_id();
+  update gh_ost_test set c1=c1+@last_insert_id, c2=c2+@last_insert_id, c3=c3+@last_insert_id where id=@last_insert_id order by id desc limit 1;
+  delete from gh_ost_test where id=1;
+  delete from gh_ost_test where c1=13; -- id=2
+end ;;

localtests/rename-reorder-columns/extra_args

@@ -0,0 +1 @@
+--alter="change column c2 c2a int not null, change column c3 c3 int not null after id" --approve-renamed-columns

localtests/rename-reorder-columns/ghost_columns

@@ -0,0 +1 @@
+id, c1, c2a, c3

localtests/rename-reorder-columns/orig_columns

@@ -0,0 +1 @@
+id, c1, c2, c3

localtests/reorder-columns/create.sql

@@ -0,0 +1,26 @@
+drop table if exists gh_ost_test;
+create table gh_ost_test (
+  id int auto_increment,
+  c1 int not null,
+  c2 int not null,
+  primary key (id)
+) auto_increment=1;
+
+drop event if exists gh_ost_test;
+delimiter ;;
+create event gh_ost_test
+  on schedule every 1 second
+  starts current_timestamp
+  ends current_timestamp + interval 60 second
+  on completion not preserve
+  enable
+  do
+begin
+  insert ignore into gh_ost_test values (1, 11, 23);
+  insert ignore into gh_ost_test values (2, 13, 29);
+  insert into gh_ost_test values (null, 17, 31);
+  set @last_insert_id := last_insert_id();
+  update gh_ost_test set c1=c1+@last_insert_id, c2=c2+@last_insert_id where id=@last_insert_id order by id desc limit 1;
+  delete from gh_ost_test where id=1;
+  delete from gh_ost_test where c1=13;
+end ;;

localtests/reorder-columns/extra_args

@@ -0,0 +1 @@
+--alter="change column c2 c2 int not null after id"

localtests/reorder-columns/ghost_columns

@@ -0,0 +1 @@
+id, c1, c2

localtests/reorder-columns/orig_columns

@@ -0,0 +1 @@
+id, c1, c2

localtests/test.sh

@@ -56,9 +56,13 @@ test_single() {
   if [ -f $tests_path/$test_name/extra_args ] ; then
     extra_args=$(cat $tests_path/$test_name/extra_args)
   fi
-  columns="*"
+  orig_columns="*"
-  if [ -f $tests_path/$test_name/test_columns ] ; then
+  ghost_columns="*"
-    columns=$(cat $tests_path/$test_name/test_columns)
+  if [ -f $tests_path/$test_name/orig_columns ] ; then
+    orig_columns=$(cat $tests_path/$test_name/orig_columns)
+  fi
+  if [ -f $tests_path/$test_name/ghost_columns ] ; then
+    ghost_columns=$(cat $tests_path/$test_name/ghost_columns)
   fi
   # graceful sleep for replica to catch up
   echo_dot
@@ -98,15 +102,15 @@ test_single() {
   fi
 
   echo_dot
-  orig_checksum=$(gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "select ${columns} from gh_ost_test" -ss | md5sum)
+  orig_checksum=$(gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "select ${orig_columns} from gh_ost_test" -ss | md5sum)
-  ghost_checksum=$(gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "select ${columns} from _gh_ost_test_gho" -ss | md5sum)
+  ghost_checksum=$(gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "select ${ghost_columns} from _gh_ost_test_gho" -ss | md5sum)
 
   if [ "$orig_checksum" != "$ghost_checksum" ] ; then
     echo "ERROR $test_name: checksum mismatch"
     echo "---"
-    gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "select ${columns} from gh_ost_test" -ss
+    gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "select ${orig_columns} from gh_ost_test" -ss
     echo "---"
-    gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "select ${columns} from _gh_ost_test_gho" -ss
+    gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "select ${ghost_columns} from _gh_ost_test_gho" -ss
     return 1
   fi
 }