Merge 7.2->7.3

Author: frazerclement

mysql-test/suite/ndb_binlog/r/ndb_binlog_flush_tables_with_read_lock.result

@@ -119,10 +119,12 @@ we see a case where a committed ndb insert
 is not binlogged by the server.
 We do this work on Server2 as it doesn't have
 a read lock :)
+create table ndbt2 (a int primary key, b varchar(100)) engine=ndb;
 Outcome
 Server 1 has insert : 0
 Server 2 has insert : 1
 Now cleanup
 drop table ndbt1;
+drop table ndbt2;
 drop table myisamt3s1;
 drop table myisamt3s2;

mysql-test/suite/ndb_binlog/t/ndb_binlog_flush_tables_with_read_lock.test

@@ -120,6 +120,8 @@ reset master;
 --echo We do this work on Server2 as it doesn't have
 --echo a read lock :)
 
+create table ndbt2 (a int primary key, b varchar(100)) engine=ndb;
+
 --disable_query_log
 --disable_result_log
 
@@ -131,17 +133,17 @@ while ($not_proven)
 {
   --connection server1
   let $SERVER1_DATADIR= `select @@datadir;`;
-  delete from test.ndbt1;
+  delete from test.ndbt2;
   reset master;
 
   --connection server2
   let $SERVER2_DATADIR= `select @@datadir;`;
-  delete from test.ndbt1;
+  delete from test.ndbt2;
   reset master;
 
   --connection server1
 
-  insert into test.ndbt1 values (123,123);
+  insert into test.ndbt2 values (123, "A most unlikely sequence if I may say so");
   flush tables with read lock;
 
   --connection server2
@@ -151,14 +153,14 @@ while ($not_proven)
   create table raw_binlog_rows_server1 (txt varchar(1000));
   create table raw_binlog_rows_server2 (txt varchar(1000));
 
-  --exec $MYSQL_BINLOG --verbose $SERVER1_DATADIR/mysqld-bin.000001 > $MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog.sql
-  --eval load data local infile '$MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog.sql' into table raw_binlog_rows_server1 columns terminated by '\n';
-  --exec $MYSQL_BINLOG --verbose $SERVER2_DATADIR/mysqld-bin.000001 > $MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog.sql
-  --eval load data local infile '$MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog.sql' into table raw_binlog_rows_server2 columns terminated by '\n';
+  --exec $MYSQL_BINLOG --verbose $SERVER1_DATADIR/mysqld-bin.000001 > $MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog1.sql
+  --eval load data local infile '$MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog1.sql' into table raw_binlog_rows_server1 columns terminated by '\n';
+  --exec $MYSQL_BINLOG --verbose $SERVER2_DATADIR/mysqld-bin.000001 > $MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog2.sql
+  --eval load data local infile '$MYSQLTEST_VARDIR/tmp/ndb_binlog_mysqlbinlog2.sql' into table raw_binlog_rows_server2 columns terminated by '\n';
 
 
-  let $server1_has_insert = `select @s1_has_ins:=count(1) > 0 from raw_binlog_rows_server1 where txt like '%123%'`;
-  let $server2_has_insert = `select @s2_has_ins:=count(1) > 0 from raw_binlog_rows_server2 where txt like '%123%'`;
+  let $server1_has_insert = `select @s1_has_ins:=count(1) > 0 from raw_binlog_rows_server1 where txt like '%A most unlikely sequence if I may say so%'`;
+  let $server2_has_insert = `select @s2_has_ins:=count(1) > 0 from raw_binlog_rows_server2 where txt like '%A most unlikely sequence if I may say so%'`;
 
   # We succeed when server 1 does not have the insert, but server 2 does.
   select @proven:= (@s1_has_ins = 0 and @s2_has_ins != 0);
@@ -183,6 +185,7 @@ while ($not_proven)
 --echo Now cleanup
 --connection server1
 drop table ndbt1;
+drop table ndbt2;
 drop table myisamt3s1;
 
 --connection server2