From a4f610f55e2901fdde5e17e3ebe0bd8221ed4771 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 11 Mar 2006 15:52:38 +0100 Subject: [PATCH] wl#3023 clean up - enabling some new tests --- mysql-test/r/ndb_binlog_ddl_multi.result | 24 ++++----- mysql-test/r/ndb_binlog_ignore_db.result | 2 - mysql-test/r/rpl_ndb_charset.result | 10 ---- mysql-test/r/rpl_ndb_dd_basic.result | 27 +++++----- mysql-test/r/rpl_ndb_log.result | 66 ++++++++++++------------ mysql-test/t/disabled.def | 1 + mysql-test/t/ndb_binlog_ignore_db.test | 7 +-- mysql-test/t/rpl_ndb_dd_basic.test | 5 +- sql/ha_ndbcluster_binlog.cc | 33 +++++++----- sql/rpl_injector.h | 5 ++ 10 files changed, 85 insertions(+), 95 deletions(-) diff --git a/mysql-test/r/ndb_binlog_ddl_multi.result b/mysql-test/r/ndb_binlog_ddl_multi.result index cee86873dbf..c9db0531021 100644 --- a/mysql-test/r/ndb_binlog_ddl_multi.result +++ b/mysql-test/r/ndb_binlog_ddl_multi.result @@ -41,10 +41,10 @@ create table t1 (a int primary key) engine=ndb; show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin1.000001 # Query # # BEGIN -master-bin1.000001 # Table_map # # cluster.apply_status -master-bin1.000001 # Write_rows # # -master-bin1.000001 # Table_map # # test.t2 -master-bin1.000001 # Write_rows # # +master-bin1.000001 # Table_map # # table_id: # (test.t2) +master-bin1.000001 # Table_map # # table_id: # (cluster.apply_status) +master-bin1.000001 # Write_rows # # table_id: # +master-bin1.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin1.000001 # Query # # COMMIT master-bin1.000001 # Query # # drop database mysqltest master-bin1.000001 # Query # # use `test`; create table t1 (a int primary key) engine=ndb @@ -148,16 +148,16 @@ show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info master-bin1.000001 # Query # # use `test`; create table t1 (a int key) engine=ndb master-bin1.000001 # Query # # BEGIN -master-bin1.000001 # Table_map # # cluster.apply_status -master-bin1.000001 # Write_rows # # -master-bin1.000001 # Table_map # # test.t1 -master-bin1.000001 # Write_rows # # +master-bin1.000001 # Table_map # # table_id: # (test.t1) +master-bin1.000001 # Table_map # # table_id: # (cluster.apply_status) +master-bin1.000001 # Write_rows # # table_id: # +master-bin1.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin1.000001 # Query # # COMMIT master-bin1.000001 # Query # # use `test`; rename table `test.t1` to `test.t2` master-bin1.000001 # Query # # BEGIN -master-bin1.000001 # Table_map # # cluster.apply_status -master-bin1.000001 # Write_rows # # -master-bin1.000001 # Table_map # # test.t2 -master-bin1.000001 # Write_rows # # +master-bin1.000001 # Table_map # # table_id: # (test.t2) +master-bin1.000001 # Table_map # # table_id: # (cluster.apply_status) +master-bin1.000001 # Write_rows # # table_id: # +master-bin1.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin1.000001 # Query # # COMMIT master-bin1.000001 # Query # # use `test`; drop table `t2` diff --git a/mysql-test/r/ndb_binlog_ignore_db.result b/mysql-test/r/ndb_binlog_ignore_db.result index e83c7b8e70f..2f411fcd03d 100644 --- a/mysql-test/r/ndb_binlog_ignore_db.result +++ b/mysql-test/r/ndb_binlog_ignore_db.result @@ -9,6 +9,4 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; drop table if exists t1 master-bin.000001 # Table_map # # table_id: # (mysql.proc) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F -master-bin.000001 # Table_map # # table_id: # (mysql.event) -master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F drop database mysqltest; diff --git a/mysql-test/r/rpl_ndb_charset.result b/mysql-test/r/rpl_ndb_charset.result index 3fac0703d01..31a7e1368f3 100644 --- a/mysql-test/r/rpl_ndb_charset.result +++ b/mysql-test/r/rpl_ndb_charset.result @@ -114,20 +114,14 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query 1 # drop database if exists mysqltest2 master-bin.000001 # Table_map 1 # table_id: # (mysql.proc) master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Table_map 1 # table_id: # (mysql.event) -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # drop database if exists mysqltest3 master-bin.000001 # Table_map 1 # table_id: # (mysql.proc) master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Table_map 1 # table_id: # (mysql.event) -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # create database mysqltest2 character set latin2 master-bin.000001 # Query 1 # create database mysqltest3 master-bin.000001 # Query 1 # drop database mysqltest3 master-bin.000001 # Table_map 1 # table_id: # (mysql.proc) master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Table_map 1 # table_id: # (mysql.event) -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # create database mysqltest3 master-bin.000001 # Query 1 # use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100)) master-bin.000001 # Table_map 1 # table_id: # (mysqltest2.t1) @@ -155,13 +149,9 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # drop database mysqltest2 master-bin.000001 # Table_map 1 # table_id: # (mysql.proc) master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Table_map 1 # table_id: # (mysql.event) -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # drop database mysqltest3 master-bin.000001 # Table_map 1 # table_id: # (mysql.proc) master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Table_map 1 # table_id: # (mysql.event) -master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F select "--- --global--" as ""; --- --global-- diff --git a/mysql-test/r/rpl_ndb_dd_basic.result b/mysql-test/r/rpl_ndb_dd_basic.result index 4c88c74a9ba..bb5919193eb 100644 --- a/mysql-test/r/rpl_ndb_dd_basic.result +++ b/mysql-test/r/rpl_ndb_dd_basic.result @@ -32,36 +32,35 @@ pk1 b c select * from t1 order by pk1; pk1 b c 1 2 3 -show binlog events; +show binlog events from ; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 102 Query 1 188 use `test`; DROP TABLE IF EXISTS t1 -master-bin.000001 188 Query 1 353 CREATE LOGFILE GROUP lg1 +master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS t1 +master-bin.000001 # Query # # CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M UNDO_BUFFER_SIZE = 1M ENGINE=NDB -master-bin.000001 353 Query 1 496 alter logfile group lg1 +master-bin.000001 # Query # # alter logfile group lg1 add undofile 'undofile02.dat' initial_size 4M engine=ndb -master-bin.000001 496 Query 1 658 CREATE TABLESPACE ts1 +master-bin.000001 # Query # # CREATE TABLESPACE ts1 ADD DATAFILE 'datafile.dat' USE LOGFILE GROUP lg1 INITIAL_SIZE 12M ENGINE NDB -master-bin.000001 658 Query 1 798 alter tablespace ts1 +master-bin.000001 # Query # # alter tablespace ts1 add datafile 'datafile02.dat' initial_size 4M engine=ndb -master-bin.000001 798 Query 1 978 use `test`; CREATE TABLE t1 +master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (pk1 int not null primary key, b int not null, c int not null) tablespace ts1 storage disk engine ndb -master-bin.000001 978 Query 1 1042 BEGIN -master-bin.000001 1042 Table_map 1 41 table_id: # (test.t1) -master-bin.000001 1083 Table_map 1 94 table_id: # (cluster.apply_status) -master-bin.000001 1136 Write_rows 1 136 table_id: # -master-bin.000001 1178 Write_rows 1 178 table_id: # flags: STMT_END_F -master-bin.000001 1220 Query 1 1285 COMMIT +master-bin.000001 # Query # # BEGIN +master-bin.000001 # Table_map # # table_id: # (test.t1) +master-bin.000001 # Table_map # # table_id: # (cluster.apply_status) +master-bin.000001 # Write_rows # # table_id: # +master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # COMMIT drop table t1; alter tablespace ts1 drop datafile 'datafile.dat' diff --git a/mysql-test/r/rpl_ndb_log.result b/mysql-test/r/rpl_ndb_log.result index 261d8d27e8f..5f6f040b715 100644 --- a/mysql-test/r/rpl_ndb_log.result +++ b/mysql-test/r/rpl_ndb_log.result @@ -21,18 +21,18 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB master-bin.000001 # Query 1 # BEGIN -master-bin.000001 # Table_map 1 # cluster.apply_status -master-bin.000001 # Write_rows 1 # -master-bin.000001 # Table_map 1 # test.t1 -master-bin.000001 # Write_rows 1 # +master-bin.000001 # Table_map 1 # table_id: # (test.t1) +master-bin.000001 # Table_map 1 # table_id: # (cluster.apply_status) +master-bin.000001 # Write_rows 1 # table_id: # +master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # COMMIT master-bin.000001 # Query 1 # use `test`; drop table t1 master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB master-bin.000001 # Query 1 # BEGIN -master-bin.000001 # Table_map 1 # cluster.apply_status -master-bin.000001 # Write_rows 1 # -master-bin.000001 # Table_map 1 # test.t1 -master-bin.000001 # Write_rows 1 # +master-bin.000001 # Table_map 1 # table_id: # (test.t1) +master-bin.000001 # Table_map 1 # table_id: # (cluster.apply_status) +master-bin.000001 # Write_rows 1 # table_id: # +master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # COMMIT show binlog events from 102 limit 1; Log_name Pos Event_type Server_id End_log_pos Info @@ -43,7 +43,7 @@ master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_in master-bin.000001 # Query 1 # BEGIN show binlog events from 102 limit 2,1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Table_map 1 # cluster.apply_status +master-bin.000001 # Table_map 1 # table_id: # (test.t1) flush logs; create table t3 (a int)ENGINE=NDB; start slave; @@ -56,18 +56,18 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB master-bin.000001 # Query 1 # BEGIN -master-bin.000001 # Table_map 1 # cluster.apply_status -master-bin.000001 # Write_rows 1 # -master-bin.000001 # Table_map 1 # test.t1 -master-bin.000001 # Write_rows 1 # +master-bin.000001 # Table_map 1 # table_id: # (test.t1) +master-bin.000001 # Table_map 1 # table_id: # (cluster.apply_status) +master-bin.000001 # Write_rows 1 # table_id: # +master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # COMMIT master-bin.000001 # Query 1 # use `test`; drop table t1 master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB master-bin.000001 # Query 1 # BEGIN -master-bin.000001 # Table_map 1 # cluster.apply_status -master-bin.000001 # Write_rows 1 # -master-bin.000001 # Table_map 1 # test.t1 -master-bin.000001 # Write_rows 1 # +master-bin.000001 # Table_map 1 # table_id: # (test.t1) +master-bin.000001 # Table_map 1 # table_id: # (cluster.apply_status) +master-bin.000001 # Write_rows 1 # table_id: # +master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000001 # Query 1 # COMMIT master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 show binlog events in 'master-bin.000002'; @@ -76,10 +76,10 @@ master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 master-bin.000002 # Query 1 # use `test`; create table t3 (a int)ENGINE=NDB master-bin.000002 # Query 1 # use `test`; create table t2 (n int)ENGINE=NDB master-bin.000002 # Query 1 # BEGIN -master-bin.000002 # Table_map 1 # cluster.apply_status -master-bin.000002 # Write_rows 1 # -master-bin.000002 # Table_map 1 # test.t2 -master-bin.000002 # Write_rows 1 # +master-bin.000002 # Table_map 1 # table_id: # (test.t2) +master-bin.000002 # Table_map 1 # table_id: # (cluster.apply_status) +master-bin.000002 # Write_rows 1 # table_id: # +master-bin.000002 # Write_rows 1 # table_id: # flags: STMT_END_F master-bin.000002 # Query 1 # COMMIT show binary logs; Log_name File_size @@ -95,18 +95,18 @@ Log_name Pos Event_type Server_id End_log_pos Info slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB slave-bin.000001 # Query 2 # BEGIN -slave-bin.000001 # Table_map 2 # cluster.apply_status -slave-bin.000001 # Write_rows 2 # -slave-bin.000001 # Table_map 2 # test.t1 -slave-bin.000001 # Write_rows 2 # +slave-bin.000001 # Table_map 2 # table_id: # (test.t1) +slave-bin.000001 # Table_map 2 # table_id: # (cluster.apply_status) +slave-bin.000001 # Write_rows 2 # table_id: # +slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F slave-bin.000001 # Query 2 # COMMIT slave-bin.000001 # Query 1 # use `test`; drop table t1 slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB slave-bin.000001 # Query 2 # BEGIN -slave-bin.000001 # Table_map 2 # cluster.apply_status -slave-bin.000001 # Write_rows 2 # -slave-bin.000001 # Table_map 2 # test.t1 -slave-bin.000001 # Write_rows 2 # +slave-bin.000001 # Table_map 2 # table_id: # (test.t1) +slave-bin.000001 # Table_map 2 # table_id: # (cluster.apply_status) +slave-bin.000001 # Write_rows 2 # table_id: # +slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F slave-bin.000001 # Query 2 # COMMIT slave-bin.000001 # Query 1 # use `test`; create table t3 (a int)ENGINE=NDB slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4 @@ -115,10 +115,10 @@ Log_name Pos Event_type Server_id End_log_pos Info slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4 slave-bin.000002 # Query 1 # use `test`; create table t2 (n int)ENGINE=NDB slave-bin.000002 # Query 2 # BEGIN -slave-bin.000002 # Table_map 2 # cluster.apply_status -slave-bin.000002 # Write_rows 2 # -slave-bin.000002 # Table_map 2 # test.t2 -slave-bin.000002 # Write_rows 2 # +slave-bin.000002 # Table_map 2 # table_id: # (test.t2) +slave-bin.000002 # Table_map 2 # table_id: # (cluster.apply_status) +slave-bin.000002 # Write_rows 2 # table_id: # +slave-bin.000002 # Write_rows 2 # table_id: # flags: STMT_END_F slave-bin.000002 # Query 2 # COMMIT show slave status; Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 11753a2c525..b97d6f8fc46 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -17,6 +17,7 @@ ndb_autodiscover : Needs to be fixed w.r.t binlog ndb_autodiscover2 : Needs to be fixed w.r.t binlog #ndb_binlog_basic : Results are not deterministic, Tomas will fix #ndb_binlog_ddl_multi : Bug#17038 [PATCH PENDING] +ndb_binlog_multi : Results are not deterministic, Tomas will fix ndb_load : Bug#17233 partition_03ndb : Bug#16385 ps_7ndb : dbug assert in RBR mode when executing test suite diff --git a/mysql-test/t/ndb_binlog_ignore_db.test b/mysql-test/t/ndb_binlog_ignore_db.test index 82a261ffe13..a4090bbb62b 100644 --- a/mysql-test/t/ndb_binlog_ignore_db.test +++ b/mysql-test/t/ndb_binlog_ignore_db.test @@ -1,8 +1,6 @@ -- source include/have_ndb.inc -- source include/have_binlog_format_row.inc ---let $binlog_start=102 - --disable_warnings drop table if exists t1; drop database if exists mysqltest; @@ -12,9 +10,6 @@ create database mysqltest; use mysqltest; create table t1 (a int primary key, b int) engine=ndb; insert into t1 values (1, 1); ---replace_result $binlog_start ---replace_column 2 # 4 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ ---eval show binlog events from $binlog_start +-- source include/show_binlog_events.inc drop database mysqltest; diff --git a/mysql-test/t/rpl_ndb_dd_basic.test b/mysql-test/t/rpl_ndb_dd_basic.test index 0e8e4124100..f515e0299ac 100644 --- a/mysql-test/t/rpl_ndb_dd_basic.test +++ b/mysql-test/t/rpl_ndb_dd_basic.test @@ -67,10 +67,7 @@ select * from t1 order by pk1; # --connection master -let $VERSION=`select version()`; ---replace_result $VERSION VERSION ---replace_regex /table_id: [0-9]+/table_id: #/ -show binlog events; +-- source include/show_binlog_events.inc # # cleanup diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index 5c19bd54d9b..7b35063eb97 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -2690,7 +2690,7 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, { case NDBEVENT::TE_INSERT: row.n_inserts++; - DBUG_PRINT("info", ("INSERT INTO %s", share->key)); + DBUG_PRINT("info", ("INSERT INTO %s.%s", table_s->db.str, table_s->table_name.str)); { if (share->flags & NSF_BLOB_FLAG) { @@ -2701,13 +2701,14 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, DBUG_ASSERT(ret == 0); } ndb_unpack_record(table, share->ndb_value[0], &b, table->record[0]); - trans.write_row(::server_id, injector::transaction::table(table, true), - &b, n_fields, table->record[0]); + int ret= trans.write_row(::server_id, injector::transaction::table(table, true), + &b, n_fields, table->record[0]); + DBUG_ASSERT(ret == 0); } break; case NDBEVENT::TE_DELETE: row.n_deletes++; - DBUG_PRINT("info",("DELETE FROM %s", share->key)); + DBUG_PRINT("info",("DELETE FROM %s.%s", table_s->db.str, table_s->table_name.str)); { /* table->record[0] contains only the primary key in this case @@ -2736,13 +2737,14 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, } ndb_unpack_record(table, share->ndb_value[n], &b, table->record[n]); DBUG_EXECUTE("info", print_records(table, table->record[n]);); - trans.delete_row(::server_id, injector::transaction::table(table, true), - &b, n_fields, table->record[n]); + int ret= trans.delete_row(::server_id, injector::transaction::table(table, true), + &b, n_fields, table->record[n]); + DBUG_ASSERT(ret == 0); } break; case NDBEVENT::TE_UPDATE: row.n_updates++; - DBUG_PRINT("info", ("UPDATE %s", share->key)); + DBUG_PRINT("info", ("UPDATE %s.%s", table_s->db.str, table_s->table_name.str)); { if (share->flags & NSF_BLOB_FLAG) { @@ -2780,11 +2782,12 @@ ndb_binlog_thread_handle_data_event(Ndb *ndb, NdbEventOperation *pOp, } ndb_unpack_record(table, share->ndb_value[1], &b, table->record[1]); DBUG_EXECUTE("info", print_records(table, table->record[1]);); - trans.update_row(::server_id, - injector::transaction::table(table, true), - &b, n_fields, - table->record[1], // before values - table->record[0]);// after values + int ret= trans.update_row(::server_id, + injector::transaction::table(table, true), + &b, n_fields, + table->record[1], // before values + table->record[0]);// after values + DBUG_ASSERT(ret == 0); } } break; @@ -3122,7 +3125,8 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) } DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str)); injector::transaction::table tbl(table, true); - trans.use_table(::server_id, tbl); + int ret= trans.use_table(::server_id, tbl); + DBUG_ASSERT(ret == 0); } } if (trans.good()) @@ -3134,7 +3138,8 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) const LEX_STRING& name=table->s->table_name; DBUG_PRINT("info", ("use_table: %.*s", name.length, name.str)); injector::transaction::table tbl(table, true); - trans.use_table(::server_id, tbl); + int ret= trans.use_table(::server_id, tbl); + DBUG_ASSERT(ret == 0); MY_BITMAP b; uint32 bitbuf; diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h index 50a0a56dd9b..14d5cca9b6c 100644 --- a/sql/rpl_injector.h +++ b/sql/rpl_injector.h @@ -235,6 +235,11 @@ public: m_thd= o.m_thd; o.m_thd= tmp; } + { + enum_state const tmp= m_state; + m_state= o.m_state; + o.m_state= tmp; + } } enum enum_state