bzr commit into mysql-5.1-telco-6.3 branch (jonas:2952)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:magnus.blaudd@stripped

 2952 Jonas Oreland	2009-05-14 [merge]
      merge 62 to 63

    M  mysql-test/suite/parts/r/ndb_dd_backuprestore.result
     2572.56.18 Jonas Oreland	2009-05-14
                ndb -
                  fix result file parts/r/ndb_dd_backuprestore.result

        M  mysql-test/suite/parts/r/ndb_dd_backuprestore.result
=== modified file 'mysql-test/suite/parts/r/ndb_dd_backuprestore.result'
--- a/mysql-test/suite/parts/r/ndb_dd_backuprestore.result	2009-03-16 21:36:14 +0000
+++ b/mysql-test/suite/parts/r/ndb_dd_backuprestore.result	2009-05-14 09:19:14 +0000
@@ -27,10 +27,6 @@ pk1	c2	c3	hex(c4)
 3	Sweden	498	1
 4	Sweden	497	1
 5	Sweden	496	1
-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;
 DROP TABLE test.t1;
 ALTER TABLESPACE table_space1
 DROP DATAFILE './table_space1/datafile.dat'
@@ -92,10 +88,6 @@ LENGTH(data)
 SELECT LENGTH(data) FROM test.t4 WHERE c1 = 2;
 LENGTH(data)
 16384
-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;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
 DROP TABLE test.t3;
@@ -319,10 +311,6 @@ pk1	c2	c3	hex(c4)
 248	TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU	4	1
 247	TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU	6	1
 246	TEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXASTEXAS, ITALY, Kyle, JO, JBM,TU	8	1
-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;
 DROP TABLE test.t1;
 DROP TABLE test.t2;
 DROP TABLE test.t3;


Attachment: [text/bzr-bundle] bzr/[e-mail]