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

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug30417

mysql-test/suite/ndb/r/ndb_autoinc.result

@@ -18,7 +18,6 @@ KEY(id)
 ) ENGINE=MYISAM;
 ALTER TABLE t3
 ENGINE NDBCLUSTER;
-ERROR HY000: Can't create table 'test.#sql-7b9e_3' (errno: 4335)
 SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (

mysql-test/suite/ndb/t/ndb_autoinc.test

@@ -27,9 +27,11 @@ CREATE TABLE t3 (
   KEY(id)
 ) ENGINE=MYISAM;
 
+--disable_result_log
 --error 1005
 ALTER TABLE t3
 ENGINE NDBCLUSTER;
+--enable_result_log
 
 SHOW CREATE TABLE t3;