Many files:

  ndb_dd_advance test cases

mysql-test/r/ndb_dd_advance.result

@@ -370,7 +370,6 @@ DROP DATAFILE './table_space2/datafile.dat'
 DROP TABLESPACE ts2 ENGINE NDB;
 DROP LOGFILE GROUP lg
 ENGINE=NDB;
-DROP DATABASE IF EXISTS test;
 CREATE LOGFILE GROUP lg
 ADD UNDOFILE './undofile.dat'
  INITIAL_SIZE 16M
@@ -381,7 +380,6 @@ ADD DATAFILE './datafile.dat'
  USE LOGFILE GROUP lg
 INITIAL_SIZE 12M
 ENGINE NDB;
-CREATE DATABASE test;
 CREATE TABLE test.t (
 a smallint NOT NULL,
 b int NOT NULL,
@@ -615,16 +613,12 @@ a	b	c	d	e	f
 99	100	101	aaa99	bbb99	ccccc99
 100	101	102	aaa100	bbb100	ccccc100
 DROP TABLE test.t;
-DROP DATABASE test;
 ALTER TABLESPACE ts
 DROP DATAFILE './datafile.dat'
  ENGINE NDB;
 DROP TABLESPACE ts ENGINE NDB;
 DROP LOGFILE GROUP lg
 ENGINE=NDB;
-DROP DATABASE IF EXISTS test;
-Warnings:
-Note	1008	Can't drop database 'test'; database doesn't exist
 DROP table IF EXISTS test.t1;
 Warnings:
 Note	1051	Unknown table 't1'
@@ -646,7 +640,6 @@ ADD DATAFILE './table_space2/datafile.dat'
  USE LOGFILE GROUP lg
 INITIAL_SIZE 12M
 ENGINE NDB;
-CREATE DATABASE test;
 CREATE TABLE test.t1 (
 a1 smallint NOT NULL,
 a2 int NOT NULL,

mysql-test/r/ndb_dd_advance2.result

 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
 DROP TABLE IF EXISTS test.t3;
-DROP DATABASE IF EXISTS test;
 *****
 **** Copy data from table in one table space to table in different table space
 *****
@@ -20,7 +19,6 @@ ADD DATAFILE './table_space2/datafile.dat'
  USE LOGFILE GROUP lg
 INITIAL_SIZE 12M
 ENGINE NDB;
-CREATE DATABASE test;
 CREATE TABLE test.t1 (a1 int NOT NULL PRIMARY KEY, a2 VARCHAR(256), a3 BLOB) 
 TABLESPACE ts1 STORAGE DISK  ENGINE=NDB;
 CREATE TABLE test.t2 (a1 int NOT NULL PRIMARY KEY, a2 VARCHAR(256), a3 BLOB) 
@@ -598,19 +596,6 @@ SELECT a1,length(a2),substr(a2,1+2*900,2),length(a3),substr(a3,1+3*900,3)
 FROM test.t1 where a1=2;
 a1	length(a2)	substr(a2,1+2*900,2)	length(a3)	substr(a3,1+3*900,3)
 2	200		3000	dd1
-SHOW VARIABLES LIKE 'have_query_cache';
-Variable_name	Value
-have_query_cache	YES
-SHOW STATUS LIKE 'Qcache%';
-Variable_name	Value
-Qcache_free_blocks	0
-Qcache_free_memory	0
-Qcache_hits	0
-Qcache_inserts	0
-Qcache_lowmem_prunes	0
-Qcache_not_cached	0
-Qcache_queries_in_cache	0
-Qcache_total_blocks	0
 DELETE FROM test.t1;
 DROP TABLE test.t1;
 ALTER TABLESPACE ts1

mysql-test/t/ndb_dd_advance.test

@@ -269,7 +269,7 @@ ENGINE =NDB;
 #### Create test that loads data, use mysql dump to dump data, drop table,
 #### create table and load from mysql dump.
 
- DROP DATABASE IF EXISTS test;
+# DROP DATABASE IF EXISTS test;
 
  CREATE LOGFILE GROUP lg
  ADD UNDOFILE './undofile.dat'
@@ -283,7 +283,7 @@ ENGINE =NDB;
  INITIAL_SIZE 12M
  ENGINE NDB;
 
-CREATE DATABASE test;
+# CREATE DATABASE test;
 
 CREATE TABLE test.t (
   a smallint NOT NULL,
@@ -319,7 +319,7 @@ show tables;
 SELECT * FROM test.t order by a;
 
  DROP TABLE test.t;
- DROP DATABASE test;  
+# DROP DATABASE test;  
 
  ALTER TABLESPACE ts
  DROP DATAFILE './datafile.dat'
@@ -395,7 +395,7 @@ SELECT * FROM test.t order by a;
 
 #### Use group by asc and dec; Use having; Use order by. ####
 
- DROP DATABASE IF EXISTS test;
+# DROP DATABASE IF EXISTS test;
  DROP table IF EXISTS test.t1; 
  DROP table IF EXISTS test.t2; 
  
@@ -417,7 +417,7 @@ SELECT * FROM test.t order by a;
  INITIAL_SIZE 12M
  ENGINE NDB;
 
-CREATE DATABASE test;
+# CREATE DATABASE test;
 
 CREATE TABLE test.t1 (
   a1 smallint NOT NULL,

mysql-test/t/ndb_dd_advance2.test

@@ -23,7 +23,6 @@
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;
 DROP TABLE IF EXISTS test.t3;
-DROP DATABASE IF EXISTS test;
 --enable_warnings
 
 #### Copy data from table in one table space to table in different table space. ####
@@ -49,8 +48,6 @@ DROP DATABASE IF EXISTS test;
  INITIAL_SIZE 12M
  ENGINE NDB;
 
- CREATE DATABASE test; 
-
  CREATE TABLE test.t1 (a1 int NOT NULL PRIMARY KEY, a2 VARCHAR(256), a3 BLOB) 
  TABLESPACE ts1 STORAGE DISK  ENGINE=NDB;
  CREATE TABLE test.t2 (a1 int NOT NULL PRIMARY KEY, a2 VARCHAR(256), a3 BLOB) 
@@ -660,8 +657,8 @@ select length(@x0),length(@b2),length(@d2) from dual;
  SELECT a1,length(a2),substr(a2,1+2*900,2),length(a3),substr(a3,1+3*900,3)
  FROM test.t1 where a1=2;
 
- SHOW VARIABLES LIKE 'have_query_cache';
- SHOW STATUS LIKE 'Qcache%';
+ #SHOW VARIABLES LIKE 'have_query_cache';
+ #SHOW STATUS LIKE 'Qcache%';
 
  DELETE FROM test.t1;
  DROP TABLE test.t1;