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

into  mysql.com:/data0/jebs_clones/mysql-5.1-new-ndb

mysql-test/lib/mtr_cases.pl

@@ -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

@@ -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

@@ -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

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

@@ -11,13 +11,6 @@
 ##############################################################################
 
 
-rpl_ndb_2innodb          : Bug #32648  	Test failure between NDB Cluster and other engines
-rpl_ndb_2myisam          : Bug #32648  	Test failure between NDB Cluster and other engines
-rpl_ndb_2other           : Bug #32648  	Test failure between NDB Cluster and other engines
 rpl_ndb_ctype_ucs2_def   : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset
-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
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
-
-#rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly

mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt

---default-storage-engine=ndbcluster 
+--new --default-storage-engine=ndbcluster 

mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt

---innodb --default-storage-engine=innodb 
+--innodb --default-storage-engine=innodb --ndbcluster=0

mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test

@@ -8,9 +8,19 @@
 # test and to have control over the tests.
 ##############################################################
 -- source include/have_ndb.inc
--- source include/ndb_master-slave.inc
-connection slave;
+-- source include/master-slave.inc
+
+-- connection slave
 -- source include/have_innodb.inc
-connection master;
-SET storage_engine=ndb;
+CREATE TABLE mysql.ndb_apply_status
+                   ( server_id INT UNSIGNED NOT NULL,
+                   epoch BIGINT UNSIGNED NOT NULL,
+                   log_name VARCHAR(255) BINARY NOT NULL,
+                   start_pos BIGINT UNSIGNED NOT NULL,
+                   end_pos BIGINT UNSIGNED NOT NULL,
+                   PRIMARY KEY USING HASH (server_id)) ENGINE=INNODB;
+
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test
+
+--connection slave
+drop table mysql.ndb_apply_status;

mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt

---default-storage-engine=ndbcluster 
+--new --default-storage-engine=ndbcluster

mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt

---default-storage-engine=myisam 
+--default-storage-engine=myisam --ndbcluster=0

mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test

@@ -8,6 +8,18 @@
 # test and to have control over the tests.
 ##############################################################
 -- source include/have_ndb.inc
--- source include/ndb_master-slave.inc
-SET storage_engine=ndb;
+-- source include/master-slave.inc
+
+-- connection slave
+CREATE TABLE mysql.ndb_apply_status
+                   ( server_id INT UNSIGNED NOT NULL,
+                   epoch BIGINT UNSIGNED NOT NULL,
+                   log_name VARCHAR(255) BINARY NOT NULL,
+                   start_pos BIGINT UNSIGNED NOT NULL,
+                   end_pos BIGINT UNSIGNED NOT NULL,
+                   PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
+
 --source extra/rpl_tests/rpl_ndb_2multi_eng.test
+
+--connection slave
+drop table mysql.ndb_apply_status;

mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt

+--log-slave-updates=0

mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test

+#############################################################
+# Author: Rafal Somla
+# Date: 2006-08-20
+# Purpose: Trying to test ability to replicate from cluster
+# to other engines (innodb, myisam), see also rpl_ndb_2other.test
+##############################################################
+--source include/have_binlog_format_mixed_or_row.inc
+--source include/ndb_master-slave.inc
+
+# On master use NDB as storage engine.
+connection master;
+SET storage_engine=ndb;
+
+--echo
+--echo === NDB -> NDB ===
+--echo
+connection slave;
+SET storage_engine=ndb;
+--source extra/rpl_tests/rpl_ndb_2multi_basic.test

mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt

---innodb --log-slave-updates=0 
+--innodb --ndbcluster=0 --log-slave-updates=0

mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test

@@ -7,7 +7,7 @@
 --source include/have_ndb.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source include/ndb_master-slave.inc
+--source include/master-slave.inc
 
 # On master use NDB as storage engine.
 connection master;
@@ -17,6 +17,13 @@ SET storage_engine=ndb;
 --echo === NDB -> MYISAM ===
 --echo
 connection slave;
+CREATE TABLE mysql.ndb_apply_status
+                   ( server_id INT UNSIGNED NOT NULL,
+                   epoch BIGINT UNSIGNED NOT NULL,
+                   log_name VARCHAR(255) BINARY NOT NULL,
+                   start_pos BIGINT UNSIGNED NOT NULL,
+                   end_pos BIGINT UNSIGNED NOT NULL,
+                   PRIMARY KEY USING HASH (server_id)) ENGINE=MYISAM;
 SET storage_engine=myisam;
 --source extra/rpl_tests/rpl_ndb_2multi_basic.test
 
@@ -24,12 +31,9 @@ SET storage_engine=myisam;
 --echo === NDB -> INNODB ===
 --echo
 connection slave;
+alter table mysql.ndb_apply_status engine=innodb;
 SET storage_engine=innodb;
 --source extra/rpl_tests/rpl_ndb_2multi_basic.test
 
---echo
---echo === NDB -> NDB ===
---echo
 connection slave;
-SET storage_engine=ndb;
---source extra/rpl_tests/rpl_ndb_2multi_basic.test
+drop table mysql.ndb_apply_status;

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

@@ -4086,9 +4086,7 @@ Dbdict::execALTER_TABLE_REQ(Signal* signal)
   bool ok = false;
   switch(tabState){
   case TableRecord::NOT_DEFINED:
-  case TableRecord::REORG_TABLE_PREPARED:
   case TableRecord::DEFINING:
-  case TableRecord::CHECKED:
     jam();
     alterTableRef(signal, req, AlterTableRef::NoSuchTable);
     return;
@@ -4339,9 +4337,7 @@ Dbdict::execALTER_TAB_REQ(Signal * signal)
     bool ok = false;
     switch(tabState){
     case TableRecord::NOT_DEFINED:
-    case TableRecord::REORG_TABLE_PREPARED:
     case TableRecord::DEFINING:
-    case TableRecord::CHECKED:
       jam();
       alterTabRef(signal, req, AlterTableRef::NoSuchTable);
       return;
@@ -6690,9 +6686,7 @@ Dbdict::execDROP_TABLE_REQ(Signal* signal){
   bool ok = false;
   switch(tabState){
   case TableRecord::NOT_DEFINED:
-  case TableRecord::REORG_TABLE_PREPARED:
   case TableRecord::DEFINING:
-  case TableRecord::CHECKED:
     jam();
     dropTableRef(signal, req, DropTableRef::NoSuchTable);
     return;
@@ -7718,7 +7712,6 @@ Dbdict::execLIST_TABLES_REQ(Signal* signal)
       if(DictTabInfo::isTable(type)){
 	switch (tablePtr.p->tabState) {
 	case TableRecord::DEFINING:
-	case TableRecord::CHECKED:
 	  conf->setTableState(pos, DictTabInfo::StateBuilding);
 	  break;
 	case TableRecord::PREPARE_DROPPING:

storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp

@@ -320,9 +320,7 @@ public:
 
     enum TabState {
       NOT_DEFINED = 0,
-      REORG_TABLE_PREPARED = 1,
       DEFINING = 2,
-      CHECKED = 3,
       DEFINED = 4,
       PREPARE_DROPPING = 5,
       DROPPING = 6,

storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp

@@ -618,6 +618,24 @@ Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
 
   if (lcp && lcp_list != RNIL)
     goto found_lcp_keep;
+
+  switch(pos.m_get){
+  case ScanPos::Get_next_tuple:
+  case ScanPos::Get_next_tuple_fs:
+    jam();
+    key.m_page_idx += size;
+    // fall through
+  case ScanPos::Get_tuple:
+  case ScanPos::Get_tuple_fs:
+    jam();
+    /**
+     * We need to refetch page after timeslice
+     */
+    pos.m_get = ScanPos::Get_page;
+    break;
+  default:
+    break;
+  }
   
   while (true) {
     switch (pos.m_get) {