bk commit into 5.1 tree (gni:1.2557) BUG#30417

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of gni. When gni 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@stripped, 2008-01-10 17:39:50+08:00, gni@stripped +2 -0
  Shouldn't let the non-deterministic temperary filename output in result file for bug#30417 

  mysql-test/suite/ndb/r/ndb_autoinc.result@stripped, 2008-01-10 17:39:46+08:00, gni@stripped +0 -1
    Temperory table name shouldn't output in result file for its name is non-deterministic

  mysql-test/suite/ndb/t/ndb_autoinc.test@stripped, 2008-01-10 17:39:46+08:00, gni@stripped +2 -0
    don't output temperary file name 

diff -Nrup a/mysql-test/suite/ndb/r/ndb_autoinc.result b/mysql-test/suite/ndb/r/ndb_autoinc.result
--- a/mysql-test/suite/ndb/r/ndb_autoinc.result	2007-11-29 19:19:53 +08:00
+++ b/mysql-test/suite/ndb/r/ndb_autoinc.result	2008-01-10 17:39:46 +08:00
@@ -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` (
diff -Nrup a/mysql-test/suite/ndb/t/ndb_autoinc.test b/mysql-test/suite/ndb/t/ndb_autoinc.test
--- a/mysql-test/suite/ndb/t/ndb_autoinc.test	2007-11-29 19:19:53 +08:00
+++ b/mysql-test/suite/ndb/t/ndb_autoinc.test	2008-01-10 17:39:46 +08:00
@@ -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;