From: magnus.blaudd Date: November 22 2011 8:07am Subject: bzr push into mysql-trunk-cluster branch (magnus.blaudd:3420 to 3422) List-Archive: http://lists.mysql.com/commits/142112 Message-Id: <201111220807.pAM87gZn029549@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3422 magnus.blaudd@stripped 2011-11-22 ndb - adapt ndb_dd_basic to new behaviour in trunk where a CREATE or ALTER involving LOGFILE GROUP or TABLESPACE now fails instead of only pushing some warnings - switch to use default_storage_engine since storage_engine is going away - remove junk comments and drop table modified: mysql-test/suite/ndb/r/ndb_dd_basic.result mysql-test/suite/ndb/t/ndb_dd_basic.test 3421 magnus.blaudd@stripped 2011-11-22 Don't include is tables from ndb in is_columns_is_embedded.test modified: mysql-test/suite/funcs_1/r/is_columns_is_embedded.result mysql-test/suite/funcs_1/t/is_columns_is_embedded.test 3420 magnus.blaudd@stripped 2011-11-21 Disable inodb, innodb-index and innodb_mysql waiting for WL#5534 modified: mysql-test/t/disabled.def === modified file 'mysql-test/suite/funcs_1/r/is_columns_is_embedded.result' --- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result 2011-09-06 12:43:05 +0000 +++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result 2011-11-22 06:21:48 +0000 @@ -1,6 +1,6 @@ SELECT * FROM information_schema.columns WHERE table_schema = 'information_schema' -AND table_name <> 'profiling' AND table_name not like 'innodb_%' +AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%' ORDER BY table_schema, table_name, column_name; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT def information_schema CHARACTER_SETS CHARACTER_SET_NAME 1 NO varchar 32 96 NULL NULL utf8 utf8_general_ci varchar(32) @@ -347,7 +347,7 @@ CHARACTER_SET_NAME, COLLATION_NAME FROM information_schema.columns WHERE table_schema = 'information_schema' -AND table_name <> 'profiling' AND table_name not like 'innodb_%' +AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH = 1 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME @@ -359,7 +359,7 @@ CHARACTER_SET_NAME, COLLATION_NAME FROM information_schema.columns WHERE table_schema = 'information_schema' -AND table_name <> 'profiling' AND table_name not like 'innodb_%' +AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH <> 1 ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME @@ -371,7 +371,7 @@ CHARACTER_SET_NAME, COLLATION_NAME FROM information_schema.columns WHERE table_schema = 'information_schema' -AND table_name <> 'profiling' AND table_name not like 'innodb_%' +AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%' AND CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH IS NULL ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME @@ -393,7 +393,7 @@ COLLATION_NAME, COLUMN_TYPE FROM information_schema.columns WHERE table_schema = 'information_schema' -AND table_name <> 'profiling' AND table_name not like 'innodb_%' +AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%' ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION; COL_CML TABLE_SCHEMA TABLE_NAME COLUMN_NAME DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE 3.0000 information_schema CHARACTER_SETS CHARACTER_SET_NAME varchar 32 96 utf8 utf8_general_ci varchar(32) === modified file 'mysql-test/suite/funcs_1/t/is_columns_is_embedded.test' --- a/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test 2009-08-07 20:04:53 +0000 +++ b/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test 2011-11-22 06:21:48 +0000 @@ -19,5 +19,5 @@ if (`SELECT VERSION() NOT LIKE '%embedde } let $my_where = WHERE table_schema = 'information_schema' -AND table_name <> 'profiling' AND table_name not like 'innodb_%'; +AND table_name <> 'profiling' AND table_name not like 'innodb_%' AND table_name not like 'ndb%'; --source suite/funcs_1/datadict/columns.inc === modified file 'mysql-test/suite/ndb/r/ndb_dd_basic.result' --- a/mysql-test/suite/ndb/r/ndb_dd_basic.result 2011-03-04 14:13:43 +0000 +++ b/mysql-test/suite/ndb/r/ndb_dd_basic.result 2011-11-22 07:17:57 +0000 @@ -1,34 +1,29 @@ select count(*) from information_schema.columns; count(*) # -DROP TABLE IF EXISTS t1; CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M UNDO_BUFFER_SIZE = 1M ENGINE=MYISAM; -Warnings: -Warning 1478 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP' +ERROR HY000: 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: -Warning 1286 Unknown storage engine 'XYZ' -Warning 1478 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP' +ERROR HY000: 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: -Warning 1478 Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP' +ERROR HY000: Table storage engine 'MyISAM' does not support the create option 'TABLESPACE or LOGFILE GROUP' CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 5K UNDO_BUFFER_SIZE = 1M ENGINE=NDB; ERROR HY000: Failed to create UNDOFILE -set storage_engine=ndb; +set default_storage_engine=ndb; CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M @@ -37,7 +32,7 @@ ALTER LOGFILE GROUP lg1 ADD UNDOFILE 'undofile02.dat' INITIAL_SIZE = 4M ENGINE=NDB; -set storage_engine=myisam; +set default_storage_engine=myisam; CREATE TABLESPACE ts1 ADD DATAFILE 'datafile.dat' USE LOGFILE GROUP lg1 === modified file 'mysql-test/suite/ndb/t/ndb_dd_basic.test' --- a/mysql-test/suite/ndb/t/ndb_dd_basic.test 2011-01-28 10:48:23 +0000 +++ b/mysql-test/suite/ndb/t/ndb_dd_basic.test 2011-11-22 07:17:57 +0000 @@ -1,17 +1,3 @@ -################################# -# Author: JO -# Org Date: ? -# Purpose: To test basic Cluster Disk Data -################################# -# Change Author: JBM -# Change Date: 2006-01-11 -# Change: Cleanup and test rename -################################# -# Change Author: Guangbao Ni -# Change Date: 2007-03-20 -# Change: Test insert data when no datafile in spacetable -################################# - -- source include/have_ndb.inc # @@ -20,28 +6,34 @@ --replace_column 1 # select count(*) from information_schema.columns; ---disable_warnings -DROP TABLE IF EXISTS t1; ---enable_warnings - +# # some negative tests +# - (which assumes that MyISAM does not support +# tablespace or logfile group) +# + +--error ER_ILLEGAL_HA_CREATE_OPTION CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M UNDO_BUFFER_SIZE = 1M ENGINE=MYISAM; +--error ER_ILLEGAL_HA_CREATE_OPTION ALTER LOGFILE GROUP lg1 ADD UNDOFILE 'undofile02.dat' INITIAL_SIZE = 4M ENGINE=XYZ; +--error ER_ILLEGAL_HA_CREATE_OPTION CREATE TABLESPACE ts1 ADD DATAFILE 'datafile.dat' USE LOGFILE GROUP lg1 INITIAL_SIZE 12M; +# # bug#29574 +# --error ER_CREATE_FILEGROUP_FAILED CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' @@ -54,7 +46,7 @@ ENGINE=NDB; # Start by creating a logfile group ################################## -set storage_engine=ndb; +set default_storage_engine=ndb; CREATE LOGFILE GROUP lg1 ADD UNDOFILE 'undofile.dat' INITIAL_SIZE 16M @@ -69,7 +61,7 @@ ENGINE=NDB; # Create a tablespace connected to the logfile group ################################################### -set storage_engine=myisam; +set default_storage_engine=myisam; CREATE TABLESPACE ts1 ADD DATAFILE 'datafile.dat' USE LOGFILE GROUP lg1 No bundle (reason: useless for push emails).