mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
This commit is contained in:
commit
4cc78e19d8
1 changed files with 10 additions and 10 deletions
|
@ -21,7 +21,7 @@ INITIAL_SIZE 16M
|
|||
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 @@ ALTER LOGFILE GROUP lg1
|
|||
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 @@ USE LOGFILE GROUP lg1
|
|||
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 @@ CREATE TABLE t1
|
|||
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 @@ ALTER TABLESPACE ts1
|
|||
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 @@ ALTER TABLESPACE ts1
|
|||
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 @@ ENGINE=NDB;
|
|||
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 ****
|
||||
|
|
Loading…
Add table
Reference in a new issue