mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
This commit is contained in:
jmiller@mysql.com 2006-01-12 14:43:59 +01:00
commit 4cc78e19d8
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mysql-test/t/ndb_dd_ddl.test
View file

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