Commit 54849724 authored by unknown's avatar unknown
Browse files

After merge fix

parent edfc33be

mysql-test/r/ndb_dd_basic.result

+3 −3
Original line number Diff line number Diff line
@@ -5,20 +5,20 @@ INITIAL_SIZE 16M 
UNDO_BUFFER_SIZE = 1M

ENGINE=MYISAM;

Warnings:

Error	1539	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

Error	1465	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

ALTER LOGFILE GROUP lg1

ADD UNDOFILE 'undofile02.dat'

INITIAL_SIZE = 4M 

ENGINE=XYZ;

Warnings:

Error	1266	Using storage engine MyISAM for table 'lg1'

Error	1539	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

Error	1465	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

CREATE TABLESPACE ts1

ADD DATAFILE 'datafile.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 12M;

Warnings:

Error	1539	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

Error	1465	Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP'

set storage_engine=ndb;

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

mysql-test/r/ndb_dd_ddl.result

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ERROR HY000: Failed to create LOGFILE GROUP 
SHOW WARNINGS;

Level	Code	Message

Error	1296	Got error 1514 'Currently there is a limit of one logfile group' from NDB

Error	1507	Failed to create LOGFILE GROUP

Error	1515	Failed to create LOGFILE GROUP

CREATE LOGFILE GROUP lg1

ADD UNDOFILE 'undofile.dat'

INITIAL_SIZE 16M