bk commit into 5.1 tree (tomas:1.2841) BUG#34006

[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@stripped, 2008-01-23 14:03:37+01:00, tomas@stripped +3 -0
  disable temp table usage as tes need disk persistant tables
  workaround for bug#34006

  mysql-test/suite/ndb_team/t/ndb_autodiscover3.test@stripped, 2008-01-23 14:03:35+01:00,
tomas@stripped +3 -0
    disable temp table usage as tes need disk persistant tables

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test@stripped, 2008-01-23 14:03:35+01:00,
tomas@stripped +7 -0
    disable temp table usage as tes need disk persistant tables
    workaround for bug#34006

  mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test@stripped, 2008-01-23 14:03:35+01:00,
tomas@stripped +7 -0
    disable temp table usage as tes need disk persistant tables
    workaround for bug#34006

diff -Nrup a/mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
b/mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
--- a/mysql-test/suite/ndb_team/t/ndb_autodiscover3.test	2007-09-05 19:32:56 +02:00
+++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover3.test	2008-01-23 14:03:35 +01:00
@@ -7,6 +7,9 @@
 
 --disable_warnings
 drop table if exists t1, t2;
+--disable_query_log
+set ndb_table_temporary=0;
+--enable_query_log
 --enable_warnings
 
 connect (con1,127.0.0.1,root,,test,$MASTER_MYPORT,);
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test	2008-01-04 15:32:58 +01:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test	2008-01-23 14:03:35 +01:00
@@ -10,6 +10,13 @@
 -- source include/have_ndb.inc
 -- source include/master-slave.inc
 
+# workaround for Bug #34006 binlog race for temporary ndb table
+# - disable using temporary ndb tables
+-- connection master
+-- disable_query_log
+set ndb_table_temporary=0;
+-- enable_query_log
+
 -- connection slave
 -- source include/have_innodb.inc
 CREATE TABLE mysql.ndb_apply_status
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test	2008-01-04 15:32:58 +01:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test	2008-01-23 14:03:35 +01:00
@@ -10,6 +10,13 @@
 -- source include/have_ndb.inc
 -- source include/master-slave.inc
 
+# workaround for Bug #34006 binlog race for temporary ndb table
+# - disable using temporary ndb tables
+-- connection master
+-- disable_query_log
+set ndb_table_temporary=0;
+-- enable_query_log
+
 -- connection slave
 CREATE TABLE mysql.ndb_apply_status
                    ( server_id INT UNSIGNED NOT NULL,