Commit 7b9d5f6b authored by jmiller/ndbdev@ndb15.mysql.com's avatar jmiller/ndbdev@ndb15.mysql.com
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 

into  mysql.com:/data0/jebs_clones/mysql-5.1-new-ndb
parents d18541d9 8b009296

mysql-test/lib/mtr_cases.pl

+1 −0
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ our @tags= 
 ["include/have_ndb.inc", "ndb_test", 1],

 ["include/have_multi_ndb.inc", "ndb_test", 1],

 ["include/have_ndb_extra.inc", "ndb_extra", 1],

 ["include/ndb_master-slave.inc", "ndb_test", 1],

 ["require_manager", "require_manager", 1],

);

mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result→mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result

+16 −16
Original line number Diff line number Diff line
@@ -440,14 +440,14 @@ f1 f2 f3 f4 
select * from t4 order by f1;

f1	f2	f3	f4

1	1	1	first

select * from t31 order by f1;

select * from t31 order by f3;

f1	f2	f3	f4

1	1	5	fifth

1	1	3	third

1	1	1	first

1	1	6	sixth

1	1	2	second

1	1	3	third

1	1	4	fourth

1	1	5	fifth

1	1	6	sixth



** Do updates master **
@@ -563,7 +563,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1534

Last_Errno	1535

Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -581,7 +581,7 @@ Seconds_Behind_Master # 
Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1534

Last_SQL_Errno	1535

Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -638,7 +638,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1534

Last_Errno	1535

Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -656,7 +656,7 @@ Seconds_Behind_Master # 
Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1534

Last_SQL_Errno	1535

Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -1581,14 +1581,14 @@ f1 f2 f3 f4 
select * from t4 order by f1;

f1	f2	f3	f4

1	1	1	first

select * from t31 order by f1;

select * from t31 order by f3;

f1	f2	f3	f4

1	1	5	fifth

1	1	3	third

1	1	1	first

1	1	6	sixth

1	1	2	second

1	1	3	third

1	1	4	fourth

1	1	5	fifth

1	1	6	sixth



** Do updates master **
@@ -1704,7 +1704,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1534

Last_Errno	1535

Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -1722,7 +1722,7 @@ Seconds_Behind_Master # 
Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1534

Last_SQL_Errno	1535

Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -1779,7 +1779,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1534

Last_Errno	1535

Last_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -1797,7 +1797,7 @@ Seconds_Behind_Master # 
Master_SSL_Verify_Server_Cert	No

Last_IO_Errno	#

Last_IO_Error	#

Last_SQL_Errno	1534

Last_SQL_Errno	1535

Last_SQL_Error	Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;

mysql-test/suite/ndb_team/t/disabled.def

+3 −0
Original line number Diff line number Diff line
@@ -15,3 +15,6 @@ ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t 
# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open

#ndb_autodiscover3        : bug#21806

#ndb_autodiscover3         : Bug#20872 2007-07-15 ingo master*.err: miscellaneous error messages

#rpl_ndb_extraColMaster   : BUG#30854 : Tables name show as binary in slave err msg on vm-win2003-64-b and Solaris

#rpl_ndb_mix_innodb       : Bug #32720   Test rpl_ndb_mix_innodb fails on SPARC and PowerPC

#rpl_ndb_dd_advance	 : Bug #30222  	rpl_ndb_dd_advance.test fails