bk commit into 5.1 tree (jmiller:1.1994)

[Jonathan Miller]

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.1994 06/01/10 15:53:43 jmiller@stripped +2 -0
  Test cleanup

  mysql-test/r/ndb_dd_dupcase.result
    1.2 06/01/10 15:53:17 jmiller@stripped +18 -0
    Test cleanup since outstanding bugs have been patched.

  mysql-test/t/ndb_dd_dupcase.test
    1.2 06/01/10 15:52:29 jmiller@stripped +18 -20
    Test cleanup since outstanding bugs have been patched.

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-dd-new

--- 1.1/mysql-test/r/ndb_dd_dupcase.result	2006-01-09 21:38:08 +01:00
+++ 1.2/mysql-test/r/ndb_dd_dupcase.result	2006-01-10 15:53:17 +01:00
@@ -23,10 +23,21 @@
 USE LOGFILE GROUP lg1
 INITIAL_SIZE 12M
 ENGINE NDB;
+CREATE TABLESPACE ts1
+ADD DATAFILE 'datafile.dat'
+USE LOGFILE GROUP lg1
+INITIAL_SIZE 12M
+ENGINE NDB;
+ERROR HY000: Failed to create TABLESPACE
+ALTER TABLESPACE ts1
+ADD DATAFILE 'datafile2.dat'
+INITIAL_SIZE 12M
+ENGINE=NDB;
 ALTER TABLESPACE ts1
 ADD DATAFILE 'datafile2.dat'
 INITIAL_SIZE 12M
 ENGINE=NDB;
+ERROR HY000: Failed to alter:  CREATE DATAFILE
 CREATE TABLE t1
 (pk1 int not null primary key, b int not null, c int not null)
 tablespace ts1 storage disk
@@ -149,11 +160,18 @@
 USE LOGFILE GROUP lg1
 INITIAL_SIZE 12M
 ENGINE NDB;
+ALTER TABLESPACE ts1
+ADD DATAFILE 'datafile2.dat'
+INITIAL_SIZE 12M
+ENGINE NDB;
 CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
 TABLESPACE ts1 STORAGE DISK
 ENGINE NDB;
 DROP TABLE t1;
+ALTER TABLESPACE ts1
+DROP DATAFILE 'datafile2.dat'
+ENGINE NDB;
 ALTER TABLESPACE ts1
 DROP DATAFILE 'datafile.dat'
 ENGINE NDB;

--- 1.1/mysql-test/t/ndb_dd_dupcase.test	2006-01-09 21:37:00 +01:00
+++ 1.2/mysql-test/t/ndb_dd_dupcase.test	2006-01-10 15:52:29 +01:00
@@ -43,12 +43,12 @@
 INITIAL_SIZE 12M
 ENGINE NDB;
 
-#--error 1502 # Bug 16158
-#CREATE TABLESPACE ts1
-#ADD DATAFILE 'datafile.dat'
-#USE LOGFILE GROUP lg1
-#INITIAL_SIZE 12M
-#ENGINE NDB;
+--error 1502 # Bug 16158
+CREATE TABLESPACE ts1
+ADD DATAFILE 'datafile.dat'
+USE LOGFILE GROUP lg1
+INITIAL_SIZE 12M
+ENGINE NDB;
 
 # Currently a bug, bug#16158
 ALTER TABLESPACE ts1
@@ -56,11 +56,11 @@
 INITIAL_SIZE 12M
 ENGINE=NDB;
 
-#--error 1507 # Currently a bug, bug#16158
-#ALTER TABLESPACE ts1
-#DROP DATAFILE 'datafile2.dat'
-#INITIAL_SIZE 12M
-#ENGINE=NDB;
+--error 1507 # Currently a bug, bug#16158
+ALTER TABLESPACE ts1
+ADD DATAFILE 'datafile2.dat'
+INITIAL_SIZE 12M
+ENGINE=NDB;
 
 CREATE TABLE t1
 (pk1 int not null primary key, b int not null, c int not null)
@@ -224,11 +224,10 @@
 INITIAL_SIZE 12M
 ENGINE NDB;
 
-# Bug# 16306
-#ALTER TABLESPACE ts1
-#ADD DATAFILE 'datafile2.dat'
-#INITIAL_SIZE 12M
-#ENGINE NDB;
+ALTER TABLESPACE ts1
+ADD DATAFILE 'datafile2.dat'
+INITIAL_SIZE 12M
+ENGINE NDB;
 
 CREATE TABLE t1
 (pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)
@@ -237,10 +236,9 @@
 
 DROP TABLE t1;
 
-# Bug# 16306
-#ALTER TABLESPACE ts1
-#DROP DATAFILE 'datafile2.dat'
-#ENGINE NDB;
+ALTER TABLESPACE ts1
+DROP DATAFILE 'datafile2.dat'
+ENGINE NDB;
 
 ALTER TABLESPACE ts1
 DROP DATAFILE 'datafile.dat'