bk commit into 5.1 tree (jmiller:1.2045)

[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.2045 06/01/12 14:31:42 jmiller@stripped +1 -0
  ndb_dd_ddl.test:
    Added requested changes to test.

  mysql-test/t/ndb_dd_ddl.test
    1.2 06/01/12 14:31:24 jmiller@stripped +10 -10
    Added requested changes to test.

# 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-new

--- 1.1/mysql-test/t/ndb_dd_ddl.test	2006-01-11 17:05:24 +01:00
+++ 1.2/mysql-test/t/ndb_dd_ddl.test	2006-01-12 14:31:24 +01:00
@@ -21,7 +21,7 @@
 UNDO_BUFFER_SIZE = 1M
 ENGINE=NDB;
 
---error 1502
+--error ER_CREATE_TABLESPACE_FAILED
 CREATE LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile.dat'
 INITIAL_SIZE 16M
@@ -32,7 +32,7 @@
 ADD UNDOFILE 'undofile02.dat'
 INITIAL_SIZE 4M ENGINE NDB;
 
---error 1507
+--error ER_ALTER_TABLESPACE_FAILED
 ALTER LOGFILE GROUP lg1
 ADD UNDOFILE 'undofile02.dat'
 INITIAL_SIZE 4M ENGINE=NDB;
@@ -43,20 +43,20 @@
 INITIAL_SIZE 12M
 ENGINE NDB;
 
---error 1502 # Bug 16158
+--error ER_CREATE_TABLESPACE_FAILED
 CREATE TABLESPACE ts1
 ADD DATAFILE 'datafile.dat'
 USE LOGFILE GROUP lg1
 INITIAL_SIZE 12M
 ENGINE NDB;
 
-# Currently a bug, bug#16158
+
 ALTER TABLESPACE ts1
 ADD DATAFILE 'datafile2.dat'
 INITIAL_SIZE 12M
 ENGINE=NDB;
 
---error 1507 # Currently a bug, bug#16158
+--error ER_ALTER_TABLESPACE_FAILED
 ALTER TABLESPACE ts1
 ADD DATAFILE 'datafile2.dat'
 INITIAL_SIZE 12M
@@ -67,7 +67,7 @@
 tablespace ts1 storage disk
 engine ndb;
 
---error 1050
+--error ER_TABLE_EXISTS_ERROR
 CREATE TABLE t1
 (pk1 int not null primary key, b int not null, c int not null)
 tablespace ts1 storage disk
@@ -79,7 +79,7 @@
 DROP DATAFILE 'datafile2.dat' 
 ENGINE=NDB;
 
---error 1507
+--error ER_ALTER_TABLESPACE_FAILED
 ALTER TABLESPACE ts1
 DROP DATAFILE 'datafile2.dat' 
 ENGINE=NDB;
@@ -88,7 +88,7 @@
 DROP DATAFILE 'datafile.dat' 
 ENGINE=NDB;
 
---error 1507
+--error ER_ALTER_TABLESPACE_FAILED
 ALTER TABLESPACE ts1
 DROP DATAFILE 'datafile.dat' 
 ENGINE=NDB;
@@ -96,14 +96,14 @@
 DROP TABLESPACE ts1 
 ENGINE=NDB;
 
---error 1503
+--error ER_DROP_TABLESPACE_FAILED
 DROP TABLESPACE ts1 
 ENGINE=NDB;
 
 DROP LOGFILE GROUP lg1 
 ENGINE=NDB;
 
---error 1503
+--error ER_DROP_TABLESPACE_FAILED
 DROP LOGFILE GROUP lg1 
 ENGINE=NDB;
 --echo **** End Duplicate Statement Testing ****