WL#3023 (RBR: Use locks in a statement-like manner):

Adaptions to make it work with NDB.


mysql-test/extra/binlog_tests/binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/blackhole.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_log.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_multi_query.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
  Using replace_regex to remove table id.
mysql-test/extra/rpl_tests/rpl_stm_charset.test:
  Using replace_regex to remove table id.
mysql-test/include/rpl_row_basic.inc:
  Removing sync with master on cleanup since there are engines that does
  not work in a "syncronized" fashion on dropping tables.
mysql-test/r/binlog_row_binlog.result:
  Result change
mysql-test/r/binlog_row_blackhole.result:
  Result change
mysql-test/r/binlog_row_ctype_cp932.result:
  Result change
mysql-test/r/binlog_row_ctype_ucs.result:
  Result change
mysql-test/r/binlog_row_insert_select.result:
  Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/r/ctype_cp932_binlog_row.result:
  Result change
mysql-test/r/rpl_row_basic_11bugs.result:
  Result change
mysql-test/r/rpl_row_basic_2myisam.result:
  Result change
mysql-test/r/rpl_row_basic_3innodb.result:
  Result change
mysql-test/r/rpl_row_charset.result:
  Result change
mysql-test/r/rpl_row_create_table.result:
  Result change
mysql-test/r/rpl_row_delayed_ins.result:
  Result change
mysql-test/r/rpl_row_log.result:
  Result change
mysql-test/r/rpl_row_log_innodb.result:
  Result change
mysql-test/r/rpl_row_max_relay_size.result:
  Result change
mysql-test/r/rpl_row_sp008.result:
  Result change
mysql-test/t/binlog_stm_binlog.test:
  Using replace_regex to remove table id.
mysql-test/t/ndb_binlog_ddl_multi.test:
  Using replace_regex to remove table id.
mysql-test/t/ndb_binlog_ignore_db.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_heap.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_loaddata_s.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_ndb_blob.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_ndb_disk.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_row_basic_11bugs.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_row_create_table.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_row_drop.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_row_sp008.test:
  Using replace_regex to remove table id.
mysql-test/t/rpl_sp.test:
  Using replace_regex to remove table id.
mysql-test/t/sp.test:
  Using replace_regex to remove table id.
mysql-test/t/sp_notembedded.test:
  Using replace_regex to remove table id.
mysql-test/t/user_var-binlog.test:
  Using replace_regex to remove table id.
sql/ha_ndbcluster_binlog.cc:
  Assign_new_table_id() now takes table share.
  Removed gratuitous friend declaration of ndb_add_binlog_index().
  Turning of binlogging during execution of ndb_add_binlog_index().
sql/handler.h:
  Removed gratuitous friend declaration of ndb_add_binlog_index().
sql/log.cc:
  Adding debug printout.
sql/log_event.cc:
  Closing thread tables on dummy event.
sql/rpl_injector.cc:
  Added support for new locking scheme.
sql/rpl_injector.h:
  Added support for new locking scheme.

mysql-test/t/ndb_binlog_ddl_multi.test

@@ -35,11 +35,13 @@ create table t1 (a int primary key) engine=ndb;
 create table t2 (a int primary key) engine=ndb;
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 # 
+--replace_regex /table_id: [0-9]+/table_id: #/
 --eval show binlog events from $binlog_start
 
 --connection server1
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 # 
+--replace_regex /table_id: [0-9]+/table_id: #/
 --eval show binlog events from $binlog_start
 
 
@@ -55,6 +57,7 @@ alter table t2 add column (b int);
 --connections server1
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 # 
+--replace_regex /table_id: [0-9]+/table_id: #/
 --eval show binlog events from $binlog_start
 
 
@@ -75,6 +78,7 @@ drop table mysqltest.t1;
 --connection server1
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 # 
+--replace_regex /table_id: [0-9]+/table_id: #/
 --eval show binlog events from $binlog_start
 
 
@@ -93,6 +97,7 @@ create table t1 (a int primary key) engine=ndb;
 --connection server2
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 # 
+--replace_regex /table_id: [0-9]+/table_id: #/
 --eval show binlog events from $binlog_start
 
 --connection server2
@@ -146,4 +151,5 @@ drop table t1;
 --connection server2
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 # 
+--replace_regex /table_id: [0-9]+/table_id: #/
 --eval show binlog events from $binlog_start