Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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-10 22:05:36+02:00, jmiller@stripped +7 -0
Many files:
Test cleanup for Master_Bind 0.0.0.0
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result@stripped, 2007-10-10 18:50:22+02:00, jmiller@stripped +1676 -1667
Test cleanup for Master_Bind 0.0.0.0
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result@stripped, 2007-10-10 18:50:22+02:00, jmiller@stripped +1676 -1667
Test cleanup for Master_Bind 0.0.0.0
mysql-test/suite/rpl/r/rpl_row_reset_slave.result@stripped, 2007-10-10 18:50:24+02:00, jmiller@stripped +4 -0
Test cleanup for Master_Bind 0.0.0.0
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result@stripped, 2007-10-10 18:50:24+02:00, jmiller@stripped +6 -0
Test cleanup for Master_Bind 0.0.0.0
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result@stripped, 2007-10-10 18:50:24+02:00, jmiller@stripped +6 -0
Test cleanup for Master_Bind 0.0.0.0
mysql-test/suite/rpl/r/rpl_row_until.result@stripped, 2007-10-10 18:50:24+02:00, jmiller@stripped +4 -0
Test cleanup for Master_Bind 0.0.0.0
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result@stripped, 2007-10-10 21:19:32+02:00, jmiller@stripped +14 -0
Test cleanup for Master_Bind 0.0.0.0
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-10-10 17:26:22 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result 2007-10-10 18:50:22 +02: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;
@@ -2413,6 +2427,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 *****
@@ -2789,6 +2804,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 *
@@ -2863,6 +2879,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;
@@ -2938,6 +2955,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;
@@ -3089,6 +3107,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;
@@ -3175,6 +3194,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;
@@ -3261,6 +3281,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-10-10 17:26:41 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result 2007-10-10 18:50:22 +02: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;
@@ -2413,6 +2427,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 *****
@@ -2789,6 +2804,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 *
@@ -2863,6 +2879,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;
@@ -2938,6 +2955,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;
@@ -3089,6 +3107,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;
@@ -3175,6 +3194,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;
@@ -3261,6 +3281,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_row_reset_slave.result b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result
--- a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result 2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result 2007-10-10 18:50:24 +02: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_row_tabledefs_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2007-08-21 15:37:49 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2007-10-10 18:50:24 +02:00
@@ -142,6 +142,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1364
Last_SQL_Error Error in Write_rows event: error during transaction execution on table test.t1_nodef.
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (2);
@@ -193,6 +194,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS;
@@ -234,6 +236,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 3, test.t4 has type 4
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (5);
@@ -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 1 type mismatch - received type 3, test.t5 has type 4
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@@ -320,6 +324,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 3, test.t6 has type 4
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@@ -362,6 +367,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2007-08-21 15:37:49 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2007-10-10 18:50:24 +02:00
@@ -142,6 +142,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1364
Last_SQL_Error Error in Write_rows event: error during transaction execution on table test.t1_nodef.
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (2);
@@ -193,6 +194,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS;
@@ -234,6 +236,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 3, test.t4 has type 4
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (5);
@@ -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 1 type mismatch - received type 3, test.t5 has type 4
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@@ -320,6 +324,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 3, test.t6 has type 4
+Master_Bind 0.0.0.0
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@@ -362,6 +367,7 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
+Master_Bind 0.0.0.0
INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_until.result b/mysql-test/suite/rpl/r/rpl_row_until.result
--- a/mysql-test/suite/rpl/r/rpl_row_until.result 2007-08-21 15:37:49 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_until.result 2007-10-10 18:50:24 +02: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=728;
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=740;
@@ -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_extraColMaster.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result 2007-10-10 17:22:06 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result 2007-10-10 21:19:32 +02: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;
| Thread |
|---|
| • bk commit into 5.1 tree (jmiller:1.2601) | jmiller | 10 Oct |
