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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

mysql-test/r/rpl_ndb_sp007.result

@@ -1,50 +0,0 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-DROP PROCEDURE IF EXISTS test.p1;
-DROP TABLE IF EXISTS test.t1;
-CREATE PROCEDURE test.p1(IN i INT)
-BEGIN
-DECLARE CONTINUE HANDLER FOR sqlexception BEGIN END;
-DROP TABLE IF EXISTS test.t1;
-CREATE TABLE test.t1 (num INT,PRIMARY KEY(num))ENGINE=NDBCLUSTER;
-START TRANSACTION;
-INSERT INTO test.t1 VALUES(i);
-savepoint t1_save;
-INSERT INTO test.t1 VALUES (14);
-ROLLBACK to savepoint t1_save;
-COMMIT;
-END|
-
-< ---- Master selects-- >
--------------------------
-CALL test.p1(12);
-Warnings:
-Note	1051	Unknown table 't1'
-SELECT * FROM test.t1;
-num
-12
-
-< ---- Slave selects-- >
-------------------------
-SELECT * FROM test.t1;
-num
-12
-
-< ---- Master selects-- >
--------------------------
-CALL test.p1(13);
-SELECT * FROM test.t1;
-num
-13
-
-< ---- Slave selects-- >
-------------------------
-SELECT * FROM test.t1;
-num
-13
-DROP PROCEDURE IF EXISTS test.p1;
-DROP TABLE IF EXISTS test.t1;

mysql-test/t/disabled.def

@@ -38,7 +38,6 @@ rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb
 rpl_ndb_log             : result not deterministic, TBD if should remove
 rpl_ndb_relay_space     : Bug#16993
 #rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails
-rpl_ndb_sp007           : Bug #18565
 rpl_row_inexist_tbl     : Disabled since patch makes this test wait forever
 rpl_sp                  : Bug#16456
 rpl_until               : Unstable test case, bug#15886

mysql-test/t/rpl_ndb_sp007.test

@@ -1,9 +0,0 @@
-#################################
-# Wrapper for rpl_row_sp007.test#
-# These tests have been wrapped #
-# so the same code can be used  #
-# For different engines         #
-#################################
--- source include/have_ndb.inc
-let $engine_type=NDBCLUSTER;
--- source extra/rpl_tests/rpl_row_sp007.test

sql/ha_ndbcluster.cc

@@ -74,6 +74,8 @@ handlerton ndbcluster_hton = {
   DB_TYPE_NDBCLUSTER,
   ndbcluster_init,
   ~(uint)0, /* slot */
+  /* below are initialized by name in ndbcluster_init() */
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 };
 
 static handler *ndbcluster_create_handler(TABLE_SHARE *table)
@@ -2336,7 +2338,7 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key,
     if (generate_scan_filter(m_cond_stack, op))
       DBUG_RETURN(ndb_err(trans));
 
-    if (res= define_read_attrs(buf, op))
+    if ((res= define_read_attrs(buf, op)))
     {
       DBUG_RETURN(res);
     }
@@ -9235,7 +9237,7 @@ char* ha_ndbcluster::get_tablespace_name(THD *thd)
   {
     NdbDictionary::Tablespace ts= ndbdict->getTablespace(id);
     ndberr= ndbdict->getNdbError();
-    if(ndberr.classification != ndberror_cl_none)
+    if(ndberr.classification != NdbError::NoError)
       goto err;
     return (my_strdup(ts.getName(), MYF(0)));
   }

storage/ndb/test/ndbapi/test_event.cpp

@@ -1537,7 +1537,7 @@ static int runCreateDropNR(NDBT_Context* ctx, NDBT_Step* step)
       break;
     }
     NdbDictionary::Table tmp(*pTab);
-    tmp.setNodeGroupIds(0, 0);
+    //tmp.setNodeGroupIds(0, 0);
     if (ndb->getDictionary()->createTable(tmp) != 0){
       g_err << "createTable failed: "
             << ndb->getDictionary()->getNdbError() << endl;