bzr commit into mysql-5.1-telco-6.3 branch (Martin.Skold:3053) Bug#39268

[Martin Skold]

#At file:///home/marty/MySQL/mysql-5.1-telco-6.3/

 3053 Martin Skold	2009-09-21 [merge]
      Merge
      modified:
        mysql-test/include/restart_mysqld.inc
        storage/ndb/src/ndbapi/Ndb.cpp

=== modified file 'mysql-test/include/restart_mysqld.inc'
--- a/mysql-test/include/restart_mysqld.inc	2008-12-25 09:53:24 +0000
+++ b/mysql-test/include/restart_mysqld.inc	2009-09-21 11:15:35 +0000
@@ -1,7 +1,11 @@
+if (!`SELECT LENGTH("$mysqld_name")`)
+{
+  let $mysqld_name=mysqld.1;
+}
 
 # Write file to make mysql-test-run.pl expect the "crash", but don't start
 # it until it's told to
---write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--write_file $MYSQLTEST_VARDIR/tmp/$mysqld_name.expect
 wait
 EOF
 
@@ -10,7 +14,7 @@ EOF
 shutdown_server 10;
 
 # Write file to make mysql-test-run.pl start up the server again
---append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--append_file $MYSQLTEST_VARDIR/tmp/$mysqld_name.expect
 restart
 EOF
 
@@ -22,4 +26,3 @@ EOF
 
 # Turn off reconnect again
 --disable_reconnect
-

=== modified file 'storage/ndb/src/ndbapi/Ndb.cpp'
--- a/storage/ndb/src/ndbapi/Ndb.cpp	2009-09-15 16:57:10 +0000
+++ b/storage/ndb/src/ndbapi/Ndb.cpp	2009-09-21 11:44:50 +0000
@@ -1442,7 +1442,7 @@ Ndb::opTupleIdOnNdb(const NdbTableImpl* 
     goto error_handler;
 
   // Start transaction with table id as hint
-  tConnection = this->startTransaction(table,
+  tConnection = this->startTransaction(m_sys_tab_0,
                                        (const char *) &aTableId,
                                        sizeof(Uint32));
   if (tConnection == NULL)