bk commit into 5.1 tree (ngrishakin:1.2189)

[Nikolay Grishakin]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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
  1.2189 06/06/13 21:18:28 ngrishakin@stripped +4 -0
  Many files:
    ndb_dd_advance test cases

  mysql-test/r/ndb_dd_advance2.result
    1.3 06/06/13 21:18:03 ngrishakin@stripped +0 -15
    ndb_dd_advance test cases

  mysql-test/r/ndb_dd_advance.result
    1.2 06/06/13 21:17:53 ngrishakin@stripped +0 -7
    ndb_dd_advance test cases

  mysql-test/t/ndb_dd_advance2.test
    1.3 06/06/13 21:17:14 ngrishakin@stripped +2 -5
    ndb_dd_advance test cases

  mysql-test/t/ndb_dd_advance.test
    1.2 06/06/13 21:17:02 ngrishakin@stripped +5 -5
    ndb_dd_advance test cases

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ngrishakin
# Host:	ndb15.mysql.com
# Root:	/home/ndbdev/ngrishakin/mysql-5.1

--- 1.1/mysql-test/r/ndb_dd_advance.result	2006-06-12 21:08:49 +02:00
+++ 1.2/mysql-test/r/ndb_dd_advance.result	2006-06-13 21:17:53 +02:00
@@ -370,7 +370,6 @@
 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 @@
  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 @@
 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 @@
  USE LOGFILE GROUP lg
 INITIAL_SIZE 12M
 ENGINE NDB;
-CREATE DATABASE test;
 CREATE TABLE test.t1 (
 a1 smallint NOT NULL,
 a2 int NOT NULL,

--- 1.2/mysql-test/r/ndb_dd_advance2.result	2006-06-13 06:20:54 +02:00
+++ 1.3/mysql-test/r/ndb_dd_advance2.result	2006-06-13 21:18:03 +02:00
@@ -1,7 +1,6 @@
 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 @@
  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 @@
 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

--- 1.1/mysql-test/t/ndb_dd_advance.test	2006-06-12 21:07:17 +02:00
+++ 1.2/mysql-test/t/ndb_dd_advance.test	2006-06-13 21:17:02 +02:00
@@ -269,7 +269,7 @@
 #### 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 @@
  INITIAL_SIZE 12M
  ENGINE NDB;
 
-CREATE DATABASE test;
+# CREATE DATABASE test;
 
 CREATE TABLE test.t (
   a smallint NOT NULL,
@@ -319,7 +319,7 @@
 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 @@
 
 #### 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 @@
  INITIAL_SIZE 12M
  ENGINE NDB;
 
-CREATE DATABASE test;
+# CREATE DATABASE test;
 
 CREATE TABLE test.t1 (
   a1 smallint NOT NULL,

--- 1.2/mysql-test/t/ndb_dd_advance2.test	2006-06-13 06:20:36 +02:00
+++ 1.3/mysql-test/t/ndb_dd_advance2.test	2006-06-13 21:17:14 +02:00
@@ -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 @@
  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 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;