Commit 613fb54f authored by unknown's avatar unknown
Browse files

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.
parent 738a1ca0

mysql-test/extra/binlog_tests/binlog.test

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ insert t2 values (5); 
commit;

# first COMMIT must be Query_log_event, second - Xid_log_event

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

drop table t1,t2;
@@ -42,6 +43,8 @@ while ($1) 
commit;

drop table t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events in 'master-bin.000001' from 102;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events in 'master-bin.000002' from 102;

mysql-test/extra/binlog_tests/blackhole.test

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ select * from t3; 
let $VERSION=`select version()`;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events;



drop table t1,t2,t3;
@@ -143,4 +144,5 @@ rollback; 
set autocommit=1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events;

mysql-test/extra/binlog_tests/ctype_cp932.test

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ SET @var1= x'8300'; 
# code (and I have used it to test the fix) until there is some way to

# exercise this code from mysql-test-run.

EXECUTE stmt1 USING @var1;

--replace_regex /table_id: [0-9]+/table_id: #/

SHOW BINLOG EVENTS FROM 102;

SELECT HEX(f1) FROM t1;

DROP table t1;

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ SET @var1= x'8300'; 
# exercise this code from mysql-test-run.

EXECUTE stmt1 USING @var1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

SHOW BINLOG EVENTS FROM 102;

SELECT HEX(f1) FROM t1;

DROP table t1;

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ create table t2 (c char(30)) charset=ucs2; 
set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be