bzr commit into mysql-6.0-ndb branch (tomas.ulin:2751)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-6.0-ndb/

 2751 Tomas Ulin	2009-03-24
      post merge fixes
      modified:
        mysql-test/suite/ndb_binlog/r/ndb_binlog_restore.result
        mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result
        mysql-test/t/mysqldump.test

=== modified file 'mysql-test/suite/ndb_binlog/r/ndb_binlog_restore.result'
--- a/mysql-test/suite/ndb_binlog/r/ndb_binlog_restore.result	2009-03-24 10:33:15 +0000
+++ b/mysql-test/suite/ndb_binlog/r/ndb_binlog_restore.result	2009-03-24 19:58:35 +0000
@@ -4,8 +4,9 @@ drop table if exists t1;
 #
 create table t1 (a int key, b int) engine ndb;
 insert into t1 values (1,1);
-CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
-LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info
+(id INT, backup_id INT) ENGINE = MEMORY;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
 DROP TABLE test.backup_info;
 #
 # extra table to be used to ensure data has arrived to binlog

=== modified file 'mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result'
--- a/mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result	2009-02-02 15:58:48 +0000
+++ b/mysql-test/suite/ndb_team/r/rpl_ndb_dd_advance.result	2009-03-24 19:58:35 +0000
@@ -265,8 +265,9 @@ COUNT(*)
 SELECT COUNT(*) FROM history;
 COUNT(*)
 200
-CREATE TEMPORARY TABLE test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
-LOAD DATA INFILE 'DUMP_FILE' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
+CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info
+(id INT, backup_id INT) ENGINE = MEMORY;
+LOAD DATA INFILE '<MYSQLTEST_VARDIR>/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
 DROP TABLE test.backup_info;
 ************ Restore the slave ************************
 CREATE DATABASE tpcb;

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2009-03-24 10:33:15 +0000
+++ b/mysql-test/t/mysqldump.test	2009-03-24 19:58:35 +0000
@@ -1683,24 +1683,6 @@ SET NAMES latin1;
 
 
 --echo #
---echo # Bug#33550 mysqldump 4.0 compatibility broken
---echo #
-
-SET NAMES utf8;
-CREATE TABLE `straße` ( f1 INT );
---exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=utf8 --compatible=mysql323 test
---exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=latin1 --compatible=mysql323 test
-DROP TABLE `straße`;
-
-CREATE TABLE `כדשגכחךלדגכחשךדגחכךלדגכ` ( f1 INT );
---exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=utf8 --compatible=mysql323 test
---error 2
---exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --skip-comments --default-character-set=latin1 --compatible=mysql323 test
-DROP TABLE `כדשגכחךלדגכחשךדגחכךלדגכ`;
-SET NAMES latin1;
-
-
---echo #
 --echo # End of 5.0 tests
 --echo #