Merge perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

mysql-test/t/disabled.def

@@ -39,8 +39,8 @@ rpl_sp_effects           : BUG#19862 2006-06-15 mkindahl
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
-rpl_ndb_idempotent       : BUG#21298 2006-07-27 msvensson
-rpl_row_basic_7ndb       : BUG#21298 2006-07-27 msvensson
-rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
+#rpl_ndb_idempotent       : BUG#21298 2006-07-27 msvensson
+#rpl_row_basic_7ndb       : BUG#21298 2006-07-27 msvensson
+#rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
 crash_commit_before      : 2006-08-02 msvensson
 rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)

mysql-test/t/rpl_ndb_func003.test

@@ -9,3 +9,4 @@
 -- source include/have_ndb.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_func003.test
+-- source include/master-slave-end.inc

mysql-test/t/rpl_ndb_idempotent.test

@@ -114,3 +114,4 @@ connection master;
 DROP TABLE IF EXISTS t1;
 
 # End of 5.1 Test
+-- source include/master-slave-end.inc

mysql-test/t/rpl_row_basic_7ndb.test

@@ -2,3 +2,4 @@
 let $type= 'NDB' ;
 let $extra_index= ;
 -- source include/rpl_row_basic.inc
+-- source include/master-slave-end.inc

mysql-test/t/rpl_truncate_7ndb.test

@@ -67,3 +67,4 @@ DROP TABLE t1;
 --replace_result $SERVER_VERSION SERVER_VERSION
 SHOW BINLOG EVENTS;
 
+-- source include/master-slave-end.inc

storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

@@ -4215,7 +4215,7 @@ Dbacc::abortSerieQueueOperation(Signal* signal, OperationrecPtr opPtr)
 	{
 	  jam();
 	  ptrCheckGuard(lastOp, coprecsize, operationrec);	
-	  ndbassert(lastOp.p->m_lock_owner_ptr_i = prevS.i);
+	  ndbassert(lastOp.p->m_lock_owner_ptr_i == prevS.i);
 	}
 	else
 	{

storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp

@@ -2600,6 +2600,9 @@ NdbDictInterface::createOrAlterTable(Ndb & ndb,
     else 
     {
       // error set by get filegroup
+      if (m_error.code == 723)
+	m_error.code = 755;
+      
       NdbMem_Free((void*)tmpTab);
       DBUG_RETURN(-1);
     }

storage/ndb/src/ndbapi/ndberror.c

@@ -376,7 +376,7 @@ ErrorBundle ErrorCodes[] = {
   { 752,  DMEC, SE, "Invalid file format" },
   { 753,  IE, SE, "Invalid filegroup for file" },
   { 754,  IE, SE, "Invalid filegroup version when creating file" },
-  { 755,  DMEC, SE, "Invalid tablespace" },
+  { 755,  HA_WRONG_CREATE_OPTION, SE, "Invalid tablespace" },
   { 756,  DMEC, SE, "Index on disk column is not supported" },
   { 757,  DMEC, SE, "Varsize bitfield not supported" },
   { 758,  DMEC, SE, "Tablespace has changed" },