Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-10-09 17:35:07+10:00, stewart@stripped +40 -0
[PATCH] Update tests and results for WL3127 slave side TCP address binding
The largest change being the addition of Master_Bind to
SHOW SLAVE STATUS and having to update tests for this.
Index: telco/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
===================================================================
mysql-test/suite/rpl/r/rpl_000015.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +3 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_change_master.result@stripped, 2007-10-08 11:54:11+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +3 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +8 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +8 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@stripped, 2007-10-08 10:45:14+10:00, stewart@stripped +1296 -1290
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@stripped, 2007-10-08 11:49:39+10:00, stewart@stripped +1296 -1290
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_flushlog_loop.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_grant.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_incident.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_loaddata.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +6 -6
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_log_pos.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_replicate_do.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_rotate_logs.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +3 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_row_log.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_row_log_innodb.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +6 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_server_id1.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_server_id2.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_skip_error.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +2 -2
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_slave_skip.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_slave_status.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_ssl.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_ssl1.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +3 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_stm_log.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +6 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +4 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl/r/rpl_stm_until.result@stripped, 2007-10-08 10:44:24+10:00, stewart@stripped +4 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +2 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +8 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +6 -6
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +1 -0
Update tests and results for WL3127 slave side TCP address binding
mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test@stripped, 2007-10-08 10:44:23+10:00, stewart@stripped +3 -3
Update tests and results for WL3127 slave side TCP address binding
diff -Nrup a/mysql-test/suite/rpl/r/rpl_000015.result b/mysql-test/suite/rpl/r/rpl_000015.result
--- a/mysql-test/suite/rpl/r/rpl_000015.result 2007-06-27 22:28:28 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_000015.result 2007-10-08 10:44:23 +10:00
@@ -44,6 +44,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT;
SHOW SLAVE STATUS;
@@ -85,6 +86,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -125,6 +127,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
drop table if exists t1;
create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90);
diff -Nrup a/mysql-test/suite/rpl/r/rpl_change_master.result b/mysql-test/suite/rpl/r/rpl_change_master.result
--- a/mysql-test/suite/rpl/r/rpl_change_master.result 2007-06-27 22:28:28 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result 2007-10-08 11:54:11 +10:00
@@ -50,6 +50,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
change master to master_user='root';
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -90,6 +91,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave;
select * from t1;
n
diff -Nrup a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result 2007-06-27 22:28:28 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result 2007-10-08 10:44:23 +10:00
@@ -83,6 +83,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
stop slave;
delete from t3;
change master to master_log_pos=548;
@@ -142,6 +143,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
set @my_max_relay_log_size= @@global.max_relay_log_size;
set global max_relay_log_size=0;
stop slave;
@@ -206,6 +208,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
drop table t1,t2,t3,t4;
set global max_relay_log_size= @my_max_relay_log_size;
End of 5.1 tests
diff -Nrup a/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result 2007-07-09 18:54:16 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result 2007-10-08 10:44:24 +10:00
@@ -92,6 +92,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t3 ***
@@ -154,6 +155,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t4 ***
@@ -216,6 +218,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t5 ***
@@ -277,6 +280,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
*** Drop t6 ***
DROP TABLE t6;
@@ -389,6 +393,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t10 ***
@@ -450,6 +455,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t11 ***
@@ -640,6 +646,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1060
Last_SQL_Error Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Try to insert in master ****
@@ -775,6 +782,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
** DROP table t17 ***
diff -Nrup a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
--- a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result 2007-07-09 18:54:16 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result 2007-10-08 10:44:24 +10:00
@@ -92,6 +92,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t3 ***
@@ -154,6 +155,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t4 ***
@@ -216,6 +218,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t5 ***
@@ -277,6 +280,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
*** Drop t6 ***
DROP TABLE t6;
@@ -389,6 +393,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t10 ***
@@ -450,6 +455,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t11 ***
@@ -640,6 +646,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1060
Last_SQL_Error Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Try to insert in master ****
@@ -775,6 +782,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
** DROP table t17 ***
diff -Nrup a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result 2007-09-06 21:16:34 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result 2007-10-08 10:45:14 +10:00
@@ -133,6 +133,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
***** Testing Altering table def scenario *****
@@ -509,6 +510,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
****************************************
* columns in master at middle of table *
@@ -583,6 +585,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@@ -658,6 +661,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@@ -809,6 +813,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -895,6 +900,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -981,6 +987,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -1273,6 +1280,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
***** Testing Altering table def scenario *****
@@ -1649,6 +1657,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
****************************************
* columns in master at middle of table *
@@ -1723,6 +1732,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@@ -1798,6 +1808,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@@ -1949,6 +1960,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -2035,6 +2047,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -2121,6 +2134,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result 2007-09-06 21:16:34 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result 2007-10-08 11:49:39 +10:00
@@ -133,6 +133,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
***** Testing Altering table def scenario *****
@@ -509,6 +510,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
****************************************
* columns in master at middle of table *
@@ -583,6 +585,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@@ -658,6 +661,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@@ -809,6 +813,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -895,6 +900,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -981,6 +987,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -1273,6 +1280,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
***** Testing Altering table def scenario *****
@@ -1649,6 +1657,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
****************************************
* columns in master at middle of table *
@@ -1723,6 +1732,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@@ -1798,6 +1808,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@@ -1949,6 +1960,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -2035,6 +2047,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
@@ -2121,6 +2134,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
+Master_Bind 0.0.0.0
STOP SLAVE;
RESET SLAVE;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result
--- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result 2007-06-27 22:28:28 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result 2007-10-08 10:44:23 +10:00
@@ -56,3 +56,4 @@ Last_IO_Errno #
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
diff -Nrup a/mysql-test/suite/rpl/r/rpl_grant.result b/mysql-test/suite/rpl/r/rpl_grant.result
--- a/mysql-test/suite/rpl/r/rpl_grant.result 2007-06-27 22:44:13 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_grant.result 2007-10-08 10:44:23 +10:00
@@ -80,3 +80,4 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
diff -Nrup a/mysql-test/suite/rpl/r/rpl_incident.result b/mysql-test/suite/rpl/r/rpl_incident.result
--- a/mysql-test/suite/rpl/r/rpl_incident.result 2007-07-09 18:54:16 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_incident.result 2007-10-08 10:44:23 +10:00
@@ -64,6 +64,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1587
Last_SQL_Error The incident LOST_EVENTS occured on the master. Message: <none>
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
SELECT * FROM t1;
@@ -111,4 +112,5 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
--- a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result 2007-06-27 22:28:28 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result 2007-10-08 10:44:23 +10:00
@@ -50,6 +50,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1105
Last_SQL_Error Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
+Master_Bind 0.0.0.0
SELECT * FROM t1;
a b
stop slave;
@@ -141,6 +142,7 @@ SELECT t2.field_a, t2.field_b, t2.field_
FROM t2
ON DUPLICATE KEY UPDATE
t1.field_3 = t2.field_c'
+Master_Bind 0.0.0.0
SELECT * FROM t1;
id field_1 field_2 field_3
drop table t1, t2;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_loaddata.result b/mysql-test/suite/rpl/r/rpl_loaddata.result
--- a/mysql-test/suite/rpl/r/rpl_loaddata.result 2007-06-27 22:28:28 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_loaddata.result 2007-10-08 10:44:23 +10:00
@@ -38,8 +38,8 @@ load data infile '../std_data_ln/rpl_loa
set global sql_slave_skip_counter=1;
start slave;
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1797 # # master-bin.000001 Yes Yes # 0 0 1797 # None 0 No # No 0 0
+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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Master_Bind
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1797 # # master-bin.000001 Yes Yes # 0 0 1797 # None 0 No # No 0 0 0.0.0.0
set sql_log_bin=0;
delete from t1;
set sql_log_bin=1;
@@ -48,8 +48,8 @@ stop slave;
change master to master_user='test';
change master to master_user='root';
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1832 # # master-bin.000001 No No # 0 0 1832 # None 0 No # No 0 0
+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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Master_Bind
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1832 # # master-bin.000001 No No # 0 0 1832 # None 0 No # No 0 0 0.0.0.0
set global sql_slave_skip_counter=1;
start slave;
set sql_log_bin=0;
@@ -59,8 +59,8 @@ load data infile '../std_data_ln/rpl_loa
stop slave;
reset slave;
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
-# 127.0.0.1 root MASTER_PORT 1 4 # # No No # 0 0 0 # None 0 No # No 0 0
+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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Master_Bind
+# 127.0.0.1 root MASTER_PORT 1 4 # # No No # 0 0 0 # None 0 No # No 0 0 0.0.0.0
reset master;
create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
unique(day)) engine=MyISAM;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
--- a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result 2007-06-27 22:44:13 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result 2007-10-08 10:44:23 +10:00
@@ -45,6 +45,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
LOAD DATA INFILE '../std_data_ln/rpl_loaddata.dat' INTO TABLE t1;
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -85,6 +86,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1590
Last_SQL_Error Fatal error: Not enough memory
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_log_pos.result b/mysql-test/suite/rpl/r/rpl_log_pos.result
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result 2007-10-08 10:44:23 +10:00
@@ -48,6 +48,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave;
stop slave;
SHOW SLAVE STATUS;
@@ -89,6 +90,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 106 <Binlog_Ignore_DB>
diff -Nrup a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
--- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result 2007-08-21 23:37:49 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result 2007-10-08 10:44:23 +10:00
@@ -60,6 +60,7 @@ Last_IO_Errno #
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
diff -Nrup a/mysql-test/suite/rpl/r/rpl_replicate_do.result b/mysql-test/suite/rpl/r/rpl_replicate_do.result
--- a/mysql-test/suite/rpl/r/rpl_replicate_do.result 2007-07-05 06:06:25 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_replicate_do.result 2007-10-08 10:44:23 +10:00
@@ -65,6 +65,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
create table t1 (ts timestamp);
set one_shot time_zone='met';
insert into t1 values('2005-08-12 00:00:00');
diff -Nrup a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result 2007-07-07 17:04:08 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result 2007-10-08 10:44:23 +10:00
@@ -53,6 +53,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
select * from t1;
s
Could not break slave
@@ -133,6 +134,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
select * from t2;
m
34
@@ -197,6 +199,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
--- a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result 2007-08-21 23:37:49 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result 2007-10-08 10:44:24 +10:00
@@ -56,4 +56,5 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1146
Last_SQL_Error Error 'Table 'test.t1' doesn't exist' on opening table `test`.`t1`
+Master_Bind 0.0.0.0
drop table t1, t2;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result
--- a/mysql-test/suite/rpl/r/rpl_row_log.result 2007-08-21 23:37:49 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result 2007-10-08 10:44:24 +10:00
@@ -272,6 +272,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result 2007-08-21 23:37:49 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result 2007-10-08 10:44:24 +10:00
@@ -280,6 +280,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
--- a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result 2007-08-21 23:37:49 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result 2007-10-08 10:44:24 +10:00
@@ -62,6 +62,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 2
#
@@ -110,6 +111,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 3: max_relay_log_size = 0
#
@@ -158,6 +160,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
#
@@ -203,6 +206,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 5
#
@@ -249,6 +253,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
#
@@ -293,6 +298,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
flush logs;
show master status;
File master-bin.000002
diff -Nrup a/mysql-test/suite/rpl/r/rpl_server_id1.result b/mysql-test/suite/rpl/r/rpl_server_id1.result
--- a/mysql-test/suite/rpl/r/rpl_server_id1.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_server_id1.result 2007-10-08 10:44:23 +10:00
@@ -47,6 +47,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave;
insert into t1 values (1);
show status like "slave_running";
diff -Nrup a/mysql-test/suite/rpl/r/rpl_server_id2.result b/mysql-test/suite/rpl/r/rpl_server_id2.result
--- a/mysql-test/suite/rpl/r/rpl_server_id2.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_server_id2.result 2007-10-08 10:44:23 +10:00
@@ -47,6 +47,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave;
insert into t1 values (1);
select * from t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_skip_error.result b/mysql-test/suite/rpl/r/rpl_skip_error.result
--- a/mysql-test/suite/rpl/r/rpl_skip_error.result 2007-08-21 23:37:49 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_skip_error.result 2007-10-08 10:44:24 +10:00
@@ -31,6 +31,6 @@ a
2
3
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 786 # # master-bin.000001 Yes Yes 0 0 786 # None 0 No # No 0 0
+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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Master_Bind
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 786 # # master-bin.000001 Yes Yes 0 0 786 # None 0 No # No 0 0 0.0.0.0
drop table t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result
--- a/mysql-test/suite/rpl/r/rpl_slave_skip.result 2007-08-21 23:37:49 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result 2007-10-08 10:44:23 +10:00
@@ -76,6 +76,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
SELECT * FROM t1;
@@ -140,5 +141,6 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
**** On Master ****
DROP TABLE t1, t2;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_slave_status.result b/mysql-test/suite/rpl/r/rpl_slave_status.result
--- a/mysql-test/suite/rpl/r/rpl_slave_status.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_slave_status.result 2007-10-08 10:44:24 +10:00
@@ -57,6 +57,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
drop table t1;
delete from mysql.user where user='rpl';
drop table t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_ssl.result b/mysql-test/suite/rpl/r/rpl_ssl.result
--- a/mysql-test/suite/rpl/r/rpl_ssl.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_ssl.result 2007-10-08 10:44:24 +10:00
@@ -58,6 +58,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
STOP SLAVE;
select * from t1;
t
@@ -102,6 +103,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
drop user replssl@localhost;
drop table t1;
End of 5.0 tests
diff -Nrup a/mysql-test/suite/rpl/r/rpl_ssl1.result b/mysql-test/suite/rpl/r/rpl_ssl1.result
--- a/mysql-test/suite/rpl/r/rpl_ssl1.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_ssl1.result 2007-10-08 10:44:24 +10:00
@@ -57,6 +57,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
stop slave;
change master to master_user='root',master_password='', master_ssl=0;
start slave;
@@ -101,6 +102,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
stop slave;
change master to
master_host="localhost",
@@ -155,4 +157,5 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
drop table t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result 2007-08-21 23:37:50 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result 2007-10-08 10:44:24 +10:00
@@ -270,6 +270,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
--- a/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result 2007-10-08 10:44:24 +10:00
@@ -60,6 +60,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 2
#
@@ -108,6 +109,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 3: max_relay_log_size = 0
#
@@ -156,6 +158,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
#
@@ -201,6 +204,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 5
#
@@ -247,6 +251,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
#
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
#
@@ -291,6 +296,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
flush logs;
show master status;
File master-bin.000002
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
--- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result 2007-10-08 10:44:24 +10:00
@@ -43,6 +43,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
stop slave;
change master to master_user='test';
SHOW SLAVE STATUS;
@@ -84,6 +85,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
reset slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -124,6 +126,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@@ -164,6 +167,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
stop slave;
reset slave;
start slave;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_until.result b/mysql-test/suite/rpl/r/rpl_stm_until.result
--- a/mysql-test/suite/rpl/r/rpl_stm_until.result 2007-06-27 22:28:29 +10:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_until.result 2007-10-08 10:44:24 +10:00
@@ -58,6 +58,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
select * from t1;
n
@@ -104,6 +105,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
select * from t2;
n
@@ -148,6 +150,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave;
stop slave;
start slave until master_log_file='master-bin.000001', master_log_pos=776;
@@ -190,6 +193,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
start slave until master_log_file='master-bin', master_log_pos=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result 2007-09-28 03:05:39 +10:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result 2007-10-08 10:44:23 +10:00
@@ -179,6 +179,7 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno <Last_SQL_Errno>
Last_SQL_Error <Last_SQL_Error>
+Master_Bind 0.0.0.0
set GLOBAL slave_transaction_retries=10;
START SLAVE;
select * from t1 order by nid;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result 2007-06-27 22:28:30 +10:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result 2007-10-08 10:44:23 +10:00
@@ -56,6 +56,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
SELECT * FROM t1 ORDER BY a;
a b
1 2
@@ -99,5 +100,6 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
STOP SLAVE;
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result 2007-07-27 23:06:40 +10:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result 2007-10-08 10:44:23 +10:00
@@ -53,6 +53,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
SELECT * FROM t1 ORDER BY a;
a b
1 2
@@ -102,3 +103,4 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result 2007-07-09 18:54:16 +10:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result 2007-10-08 10:44:23 +10:00
@@ -92,6 +92,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t3 ***
@@ -154,6 +155,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t4 ***
@@ -216,6 +218,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t5 ***
@@ -277,6 +280,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
*** Drop t6 ***
DROP TABLE t6;
@@ -389,6 +393,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t10 ***
@@ -450,6 +455,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t11 ***
@@ -640,6 +646,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1060
Last_SQL_Error Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Try to insert in master ****
@@ -776,6 +783,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1532
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
** DROP table t17 ***
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result 2007-06-27 22:28:30 +10:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result 2007-10-08 10:44:23 +10:00
@@ -33,15 +33,15 @@ c1 c2 c3
row3 C 3
row4 D 4
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
-<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0
+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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Master_Bind
+<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0 0.0.0.0
STOP SLAVE;
CHANGE MASTER TO
master_log_file = 'master-bin.000001',
master_log_pos = <the_pos> ;
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
-<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 No No <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0
+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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Master_Bind
+<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 No No <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0 0.0.0.0
START SLAVE;
SELECT * FROM t1 ORDER BY c3;
c1 c2 c3
@@ -68,6 +68,6 @@ SELECT * FROM t1;
c1 c2 c3
row2 new on slave 2
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
-<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> <Last_IO_Errno> <Last_IO_Error> 0
+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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Master_Bind
+<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> <Last_IO_Errno> <Last_IO_Error> 0 0.0.0.0
DROP TABLE IF EXISTS t1;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result 2007-08-24 19:14:42 +10:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result 2007-10-08 10:44:23 +10:00
@@ -304,6 +304,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result 2007-08-21 23:37:50 +10:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result 2007-10-08 10:44:23 +10:00
@@ -110,6 +110,7 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
hex(c1) hex(c2) c3
1 1 row1
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test 2007-07-25 23:29:29 +10:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test 2007-10-08 10:44:23 +10:00
@@ -73,7 +73,7 @@ CREATE TABLE ACCOUNT_TYPE ( ACCOUNT_TYPE
#
# create "BANK" application
#
---exec NDB_CONNECTSTRING=localhost:$NDBCLUSTER_PORT ../storage/ndb/test/ndbapi/bank/bankCreator >> $NDB_TOOLS_OUTPUT
+--exec ../storage/ndb/test/ndbapi/bank/bankCreator --skip-create >> $NDB_TOOLS_OUTPUT
#
# start main loop
@@ -128,8 +128,8 @@ let the_backup_id=`select @the_backup_id
# restore on slave, first check that nothing is there
--connection slave
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec echo $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
+--exec echo $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="localhost:$NDBCLUSTER_PORT_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
#
# now setup replication to continue from last epoch
| Thread |
|---|
| • bk commit into 5.1 tree (stewart:1.2620) | Stewart Smith | 9 Oct |
