bk commit into 5.1 tree (tomas:1.2237)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2237 06/03/27 19:41:37 tomas@stripped +4 -0
  removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
  compile error fixes

  sql/ha_ndbcluster.cc
    1.293 06/03/27 19:41:30 tomas@stripped +4 -2
    compile error fixes

  mysql-test/t/disabled.def
    1.113 06/03/27 19:41:30 tomas@stripped +0 -1
    removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb

  BitKeeper/deleted/.del-rpl_ndb_sp007.result~b1b713abfd655893
    1.2 06/03/27 19:40:21 tomas@stripped +0 -0
    Delete: mysql-test/r/rpl_ndb_sp007.result

  BitKeeper/deleted/.del-rpl_ndb_sp007.test~72c66392eed0d74
    1.3 06/03/27 19:40:15 tomas@stripped +0 -0
    Delete: mysql-test/t/rpl_ndb_sp007.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.112/mysql-test/t/disabled.def	2006-03-25 00:23:58 +01:00
+++ 1.113/mysql-test/t/disabled.def	2006-03-27 19:41:30 +02:00
@@ -36,7 +36,6 @@
 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 #17290
 rpl_row_inexist_tbl     : Disabled since patch makes this test wait forever
 rpl_sp                  : Bug#16456
 rpl_until               : Unstable test case, bug#15886

--- 1.292/sql/ha_ndbcluster.cc	2006-03-24 17:36:40 +01:00
+++ 1.293/sql/ha_ndbcluster.cc	2006-03-27 19:41:30 +02:00
@@ -74,6 +74,8 @@
   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 @@
     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 @@
   {
     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)));
   }