List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:May 10 2011 12:35pm
Subject:bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3332)
View as plain text  
#At file:///data0/magnus/mysql/merge-5.5.11-to-5.5-cluster/ based on revid:magnus.blaudd@stripped-8xzasg4hvhwx4zwe

 3332 Magnus Blåudd	2011-05-10
      ndb
       - update .result file for rpl_ndb after merge, new suppressions had
         been added in the testcases that are sourced from extra/rpl_tests
       - Add same suppressions for rpl_ndb_type_conversion*.test as has been added
         to rpl_typeconv.test
       - Fix the suppression in rpl_type_conversion since we have hacked the
         rpl_conversion test to have a primary key column to allow
         testing rpl with blobs and engine=NDB. This causes the suppression
         to say "Column 1" instead of "Column 0"

    modified:
      mysql-test/suite/rpl/r/rpl_typeconv.result
      mysql-test/suite/rpl/t/rpl_typeconv.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test
=== modified file 'mysql-test/suite/rpl/r/rpl_typeconv.result'
--- a/mysql-test/suite/rpl/r/rpl_typeconv.result	2011-05-10 09:48:14 +0000
+++ b/mysql-test/suite/rpl/r/rpl_typeconv.result	2011-05-10 12:32:21 +0000
@@ -534,7 +534,7 @@ BIT(6)         	BIT(5)         	ALL_LOSS
 BIT(5)         	BIT(12)        	ALL_LOSSY,ALL_NON_LOSSY  	<Correct value>
 BIT(12)        	BIT(5)         	ALL_LOSSY,ALL_NON_LOSSY  	<Correct value>
 DROP TABLE type_conversions;
-call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
 DROP TABLE t1;
 set global slave_type_conversions = @saved_slave_type_conversions;
 include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_typeconv.test'
--- a/mysql-test/suite/rpl/t/rpl_typeconv.test	2011-05-10 09:48:14 +0000
+++ b/mysql-test/suite/rpl/t/rpl_typeconv.test	2011-05-10 12:32:21 +0000
@@ -61,7 +61,7 @@ SELECT RPAD(Source, 15, ' ') AS Source_T
 enable_query_log;
 DROP TABLE type_conversions;
 
-call mtr.add_suppression("Slave SQL.*Column 0 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
 
 connection master;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result	2011-04-27 08:25:55 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_master.result	2011-05-10 12:32:21 +0000
@@ -58,6 +58,11 @@ f1	f2	f3	f4	f5	f6	f7	f8	f9	hex(f10)	hex(
 27	27	27	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
 29	29	29	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
 30	30	30	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
+call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
+call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
+call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
+call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
+call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677");
 
 * Select count and 20 rows from Slave *
 
@@ -929,6 +934,11 @@ f1	f2	f3	f4	f5	f6	f7	f8	f9	hex(f10)	hex(
 27	27	27	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
 29	29	29	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
 30	30	30	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
+call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
+call mtr.add_suppression("Slave SQL.*Error .Can.t DROP .c7.; check that column.key exists. on query.* 1091");
+call mtr.add_suppression("Slave SQL.*Error .Unknown column .c7. in .t15.. on query.* 1054");
+call mtr.add_suppression("Slave SQL.*Error .Key column .c6. doesn.t exist in table. on query.* 1072");
+call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677");
 
 * Select count and 20 rows from Slave *
 

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result	2011-04-27 09:24:20 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result	2011-05-10 12:32:21 +0000
@@ -1,6 +1,7 @@
 include/master-slave.inc
 [connection master]
 call mtr.add_suppression("Slave: Unknown table 't6' Error_code: 1051");
+call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
 **** Diff Table Def Start ****
 *** On Slave ***
 STOP SLAVE;
@@ -436,6 +437,9 @@ c4 BLOB, c5 CHAR(5)) ENGINE='NDB';
 RESET MASTER;
 *** Start Slave ***
 START SLAVE;
+call mtr.add_suppression("Error .Unknown table .t6.. on query.* Error_code: 1051");
+call mtr.add_suppression("Error .Duplicate column name .c6.. on query.* Error_code: 1060");
+call mtr.add_suppression("Table definition on master and slave does not match: Column . ...e mismatch.* Error_code: 1535");
 *** Master Data Insert ***
 set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result	2011-04-21 07:23:14 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result	2011-05-10 12:32:21 +0000
@@ -478,6 +478,9 @@ INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
 include/diff_tables.inc [master:t2, slave:t2]
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
+call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* Error_code: 1535");
+call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* Error_code: 1032");
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, Error_code: 1677");
 include/rpl_reset.inc
 [expecting slave to replicate correctly]
 INSERT INTO t4 VALUES (1, "", 1);

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test	2011-04-21 12:36:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test	2011-05-10 12:32:21 +0000
@@ -39,6 +39,11 @@ connection slave;
 
 DROP TABLE type_conversions;
 
+--disable_query_log
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+--enable_query_log
+
+
 connection master;
 DROP TABLE t1;
 sync_slave_with_master;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test	2011-04-21 12:36:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test	2011-05-10 12:32:21 +0000
@@ -39,6 +39,10 @@ connection slave;
 
 DROP TABLE type_conversions;
 
+--disable_query_log
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+--enable_query_log
+
 connection master;
 DROP TABLE t1;
 sync_slave_with_master;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test	2011-04-21 12:36:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test	2011-05-10 12:32:21 +0000
@@ -39,6 +39,10 @@ connection slave;
 
 DROP TABLE type_conversions;
 
+--disable_query_log
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+--enable_query_log
+
 connection master;
 DROP TABLE t1;
 sync_slave_with_master;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test	2011-04-21 12:36:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test	2011-05-10 12:32:21 +0000
@@ -39,6 +39,10 @@ connection slave;
 
 DROP TABLE type_conversions;
 
+--disable_query_log
+call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* Error_code: 1677");
+--enable_query_log
+
 connection master;
 DROP TABLE t1;
 sync_slave_with_master;

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110510123221-tkm8l4tzhahrxbaq.bundle
Thread
bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3332) Magnus Blåudd10 May