~tsarev/percona-server/rnt-5.1_replication_slave_skip_columns_mysqlbinlog
» Revision
177
: mysql-test-rnt.diff
« back to all changes in this revision
Viewing changes to mysql-test-rnt.diff
- browse files at revision 177
- compare with another revision
- download diff
- download tarball
- view history from revision 177
- Committer: Oleg Tsarev
- Date: 2011-06-20 10:47:43 UTC
- Revision ID: oleg.tsarev@percona.com-20110620104743-ngeqdcx5jhx49u4j
fix fails (replication_slave_skip_columns.patch)
added
removed
mysql-test-rnt.diff
8872
8872
include/rpl_reset.inc
8873
8873
[expecting slave to replicate correctly]
8874
8874
INSERT INTO t7 VALUES (1, "", 1);
8875
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_colSize.result b/mysql-test/suite/rpl/r/rpl_row_colSize.result
8876
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result 2011-06-20 13:12:37.443990999 +0300
8877
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result 2011-06-20 13:13:21.646161382 +0300
8878
@@ -15,7 +15,7 @@
8879
INSERT INTO t1 VALUES (901251.90125);
8880
START SLAVE;
8881
include/wait_for_slave_sql_error.inc [errno=1677]
8882
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)''
8883
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)''
8884
SELECT COUNT(*) FROM t1;
8885
COUNT(*)
8886
0
8887
@@ -32,7 +32,7 @@
8888
INSERT INTO t1 VALUES (901251.90125);
8889
START SLAVE;
8890
include/wait_for_slave_sql_error.inc [errno=1677]
8891
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'decimal(27,18)' to type 'decimal(27,9)''
8892
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'decimal(27,18)' to type 'decimal(27,9)''
8893
SELECT COUNT(*) FROM t1;
8894
COUNT(*)
8895
0
8896
@@ -49,7 +49,7 @@
8897
INSERT INTO t1 VALUES (901251.90125);
8898
START SLAVE;
8899
include/wait_for_slave_sql_error.inc [errno=1677]
8900
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)''
8901
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)''
8902
SELECT COUNT(*) FROM t1;
8903
COUNT(*)
8904
0
8905
@@ -67,7 +67,7 @@
8906
INSERT INTO t1 VALUES (901251.90125);
8907
START SLAVE;
8908
include/wait_for_slave_sql_error.inc [errno=1677]
8909
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'double' to type 'float''
8910
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'double' to type 'float''
8911
SELECT COUNT(*) FROM t1;
8912
COUNT(*)
8913
0
8914
@@ -85,7 +85,7 @@
8915
INSERT INTO t1 VALUES (B'10101');
8916
START SLAVE;
8917
include/wait_for_slave_sql_error.inc [errno=1677]
8918
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)''
8919
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)''
8920
SELECT COUNT(*) FROM t1;
8921
COUNT(*)
8922
0
8923
@@ -102,7 +102,7 @@
8924
INSERT INTO t1 VALUES (B'10101');
8925
START SLAVE;
8926
include/wait_for_slave_sql_error.inc [errno=1677]
8927
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)''
8928
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)''
8929
SELECT COUNT(*) FROM t1;
8930
COUNT(*)
8931
0
8932
@@ -120,7 +120,7 @@
8933
INSERT INTO t1 VALUES ('4');
8934
START SLAVE;
8935
include/wait_for_slave_sql_error.inc [errno=1677]
8936
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'set' to type 'set('4')''
8937
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'set' to type 'set('4')''
8938
SELECT COUNT(*) FROM t1;
8939
COUNT(*)
8940
0
8941
@@ -138,7 +138,7 @@
8942
INSERT INTO t1 VALUES ('This is a test.');
8943
START SLAVE;
8944
include/wait_for_slave_sql_error.inc [errno=1677]
8945
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)''
8946
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)''
8947
SELECT COUNT(*) FROM t1;
8948
COUNT(*)
8949
0
8950
@@ -187,7 +187,7 @@
8951
INSERT INTO t1 VALUES ('44');
8952
START SLAVE;
8953
include/wait_for_slave_sql_error.inc [errno=1677]
8954
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')''
8955
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')''
8956
SELECT COUNT(*) FROM t1;
8957
COUNT(*)
8958
0
8959
@@ -205,7 +205,7 @@
8960
INSERT INTO t1 VALUES ('This is a test.');
8961
START SLAVE;
8962
include/wait_for_slave_sql_error.inc [errno=1677]
8963
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)''
8964
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)''
8965
SELECT COUNT(*) FROM t1;
8966
COUNT(*)
8967
0
8968
@@ -222,7 +222,7 @@
8969
INSERT INTO t1 VALUES ('This is a test.');
8970
START SLAVE;
8971
include/wait_for_slave_sql_error.inc [errno=1677]
8972
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)''
8973
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)''
8974
SELECT COUNT(*) FROM t1;
8975
COUNT(*)
8976
0
8977
@@ -239,7 +239,7 @@
8978
INSERT INTO t1 VALUES ('This is a test.');
8979
START SLAVE;
8980
include/wait_for_slave_sql_error.inc [errno=1677]
8981
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)''
8982
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)''
8983
SELECT COUNT(*) FROM t1;
8984
COUNT(*)
8985
0
8986
@@ -257,7 +257,7 @@
8987
INSERT INTO t1 VALUES ('This is a test.');
8988
START SLAVE;
8989
include/wait_for_slave_sql_error.inc [errno=1677]
8990
-Last_SQL_Error = 'Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob''
8991
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob''
8992
SELECT COUNT(*) FROM t1;
8993
COUNT(*)
8994
0
8995
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
8996
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2011-06-20 13:12:37.657986956 +0300
8997
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result 2011-06-20 13:14:48.624557796 +0300
8998
@@ -119,15 +119,15 @@
8999
INSERT INTO t4 VALUES (4);
9000
call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
9001
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
9002
-Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float''
9003
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t4' cannot be converted from type 'int' to type 'float''
9004
INSERT INTO t9 VALUES (5);
9005
INSERT INTO t5 VALUES (5,10,25);
9006
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
9007
-Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float''
9008
+Last_SQL_Error = 'Column 'b' (on master #1, on slave #1) of table 'test.t5' cannot be converted from type 'int' to type 'float''
9009
INSERT INTO t9 VALUES (6);
9010
INSERT INTO t6 VALUES (6,12,36);
9011
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
9012
-Last_SQL_Error = 'Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float''
9013
+Last_SQL_Error = 'Column 'c' (on master #2, on slave #2) of table 'test.t6' cannot be converted from type 'int' to type 'float''
9014
INSERT INTO t9 VALUES (6);
9015
include/check_slave_is_running.inc
9016
INSERT INTO t7 VALUES (1),(2),(3);
9017
diff -ruN a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
9018
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2011-06-20 13:12:37.662986861 +0300
9019
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result 2011-06-20 13:14:07.464312141 +0300
9020
@@ -119,15 +119,15 @@
9021
INSERT INTO t4 VALUES (4);
9022
call mtr.add_suppression("Slave SQL.*Column.*of table.*cannot be converted from type.*to type.* 1677");
9023
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
9024
-Last_SQL_Error = 'Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float''
9025
+Last_SQL_Error = 'Column 'a' (on master #0, on slave #0) of table 'test.t4' cannot be converted from type 'int' to type 'float''
9026
INSERT INTO t9 VALUES (5);
9027
INSERT INTO t5 VALUES (5,10,25);
9028
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
9029
-Last_SQL_Error = 'Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float''
9030
+Last_SQL_Error = 'Column 'b' (on master #1, on slave #1) of table 'test.t5' cannot be converted from type 'int' to type 'float''
9031
INSERT INTO t9 VALUES (6);
9032
INSERT INTO t6 VALUES (6,12,36);
9033
include/wait_for_slave_sql_error_and_skip.inc [errno=1677]
9034
-Last_SQL_Error = 'Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float''
9035
+Last_SQL_Error = 'Column 'c' (on master #2, on slave #2) of table 'test.t6' cannot be converted from type 'int' to type 'float''
9036
INSERT INTO t9 VALUES (6);
9037
include/check_slave_is_running.inc
9038
INSERT INTO t7 VALUES (1),(2),(3);
Loggerhead is a web-based interface for Breezy
Version: 2.0.1