diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-07-14 13:48:06 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-14 13:48:06 +0200 |
commit | 48c54cd35517c02bab8db7dc1c5567d636cb6d3d (patch) | |
tree | 80a39771d7b4f6b663600e95a98ef123d544052f /mysql-test/suite/parts/inc | |
parent | 9fea6e7b7bbe0bb8438404819ed858bdd4db5c21 (diff) | |
download | mariadb-git-48c54cd35517c02bab8db7dc1c5567d636cb6d3d.tar.gz |
parts suite merged
Diffstat (limited to 'mysql-test/suite/parts/inc')
-rw-r--r-- | mysql-test/suite/parts/inc/partition.pre | 8 | ||||
-rw-r--r-- | mysql-test/suite/parts/inc/partition_alter3.inc | 2 | ||||
-rw-r--r-- | mysql-test/suite/parts/inc/partition_crash_exchange.inc | 29 | ||||
-rw-r--r-- | mysql-test/suite/parts/inc/partition_crash_t2.inc | 12 | ||||
-rw-r--r-- | mysql-test/suite/parts/inc/partition_fail_exchange.inc | 27 | ||||
-rw-r--r-- | mysql-test/suite/parts/inc/partition_fail_t2.inc | 31 |
6 files changed, 105 insertions, 4 deletions
diff --git a/mysql-test/suite/parts/inc/partition.pre b/mysql-test/suite/parts/inc/partition.pre index f9b361c787c..f82916ae631 100644 --- a/mysql-test/suite/parts/inc/partition.pre +++ b/mysql-test/suite/parts/inc/partition.pre @@ -23,13 +23,13 @@ ################################################################################ # Set the session storage engine -eval SET @@session.storage_engine = $engine; +eval SET @@session.default_storage_engine = $engine; ##### Disabled/affected testcases, because of open bugs ##### # --echo # --echo #------------------------------------------------------------------------ # --echo # There are several testcases disabled because of the open bugs -# if (`SELECT @@session.storage_engine IN('ndbcluster')`) +# if (`SELECT @@session.default_storage_engine IN('ndbcluster')`) # { # --echo # #18730 # } @@ -135,7 +135,7 @@ f_charbig VARCHAR(1000); # in partition_methods[1|2].inc and partition_alter_1[1|3].inc # when $sub_part_no is set to >= 3. let $sub_part_no= 3; -if (`SELECT @@session.storage_engine = 'ndbcluster'`) +if (`SELECT @@session.default_storage_engine = 'ndbcluster'`) { let $sub_part_no= 2; } @@ -318,7 +318,7 @@ if (0) # --source inc/have_partition.inc # b) Engine specific settings and requirements # $do_pk_tests, $MAX_VALUE, $engine -# SET SESSION storage_engine +# SET SESSION default_storage_engine # $engine_other # c) Generate the prerequisites ($variables, @variables, tables) needed # via diff --git a/mysql-test/suite/parts/inc/partition_alter3.inc b/mysql-test/suite/parts/inc/partition_alter3.inc index 1fad361b371..395f93f44f6 100644 --- a/mysql-test/suite/parts/inc/partition_alter3.inc +++ b/mysql-test/suite/parts/inc/partition_alter3.inc @@ -115,6 +115,7 @@ ALTER TABLE t1 REMOVE PARTITIONING; --source suite/parts/inc/partition_check_read1.inc # --echo # 1.2.7 Remove partitioning from not partitioned table --> ???? +--error ER_PARTITION_MGMT_ON_NONPARTITIONED ALTER TABLE t1 REMOVE PARTITIONING; DROP TABLE t1; --source suite/parts/inc/partition_check_drop.inc @@ -193,6 +194,7 @@ ALTER TABLE t1 REMOVE PARTITIONING; --source suite/parts/inc/partition_check_read2.inc # --echo # 2.2.7 Remove partitioning from not partitioned table --> ???? +--error ER_PARTITION_MGMT_ON_NONPARTITIONED ALTER TABLE t1 REMOVE PARTITIONING; DROP TABLE t1; --source suite/parts/inc/partition_check_drop.inc diff --git a/mysql-test/suite/parts/inc/partition_crash_exchange.inc b/mysql-test/suite/parts/inc/partition_crash_exchange.inc new file mode 100644 index 00000000000..399cff8f376 --- /dev/null +++ b/mysql-test/suite/parts/inc/partition_crash_exchange.inc @@ -0,0 +1,29 @@ +# To be used with WL#4445: EXCHANGE PARTITION WITH TABLE. +SET SESSION debug_dbug="+d,exchange_partition_abort_1"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_1"; +SET SESSION debug_dbug="+d,exchange_partition_abort_2"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_2"; +SET SESSION debug_dbug="+d,exchange_partition_abort_3"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_3"; +SET SESSION debug_dbug="+d,exchange_partition_abort_4"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_4"; +SET SESSION debug_dbug="+d,exchange_partition_abort_5"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_5"; +SET SESSION debug_dbug="+d,exchange_partition_abort_6"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_6"; +SET SESSION debug_dbug="+d,exchange_partition_abort_7"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_7"; +SET SESSION debug_dbug="+d,exchange_partition_abort_8"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_8"; +SET SESSION debug_dbug="+d,exchange_partition_abort_9"; +--source suite/parts/inc/partition_crash_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_abort_9"; + diff --git a/mysql-test/suite/parts/inc/partition_crash_t2.inc b/mysql-test/suite/parts/inc/partition_crash_t2.inc new file mode 100644 index 00000000000..fd88cc60a8d --- /dev/null +++ b/mysql-test/suite/parts/inc/partition_crash_t2.inc @@ -0,0 +1,12 @@ +# Include file to extend partition_crash with a second table. +# To be used with WL#4445: EXCHANGE PARTITION WITH TABLE. +--eval $create_statement2 +--eval $insert_statement2 +SHOW CREATE TABLE t2; +--sorted_result +SELECT * FROM t2; +--source suite/parts/inc/partition_crash.inc +SHOW CREATE TABLE t2; +--sorted_result +SELECT * FROM t2; +DROP TABLE t2; diff --git a/mysql-test/suite/parts/inc/partition_fail_exchange.inc b/mysql-test/suite/parts/inc/partition_fail_exchange.inc new file mode 100644 index 00000000000..cc8d76bedfe --- /dev/null +++ b/mysql-test/suite/parts/inc/partition_fail_exchange.inc @@ -0,0 +1,27 @@ +SET SESSION debug_dbug="+d,exchange_partition_fail_1"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_1"; +SET SESSION debug_dbug="+d,exchange_partition_fail_2"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_2"; +SET SESSION debug_dbug="+d,exchange_partition_fail_3"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_3"; +SET SESSION debug_dbug="+d,exchange_partition_fail_4"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_4"; +SET SESSION debug_dbug="+d,exchange_partition_fail_5"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_5"; +SET SESSION debug_dbug="+d,exchange_partition_fail_6"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_6"; +SET SESSION debug_dbug="+d,exchange_partition_fail_7"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_7"; +SET SESSION debug_dbug="+d,exchange_partition_fail_8"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_8"; +SET SESSION debug_dbug="+d,exchange_partition_fail_9"; +--source suite/parts/inc/partition_fail_t2.inc +SET SESSION debug_dbug="-d,exchange_partition_fail_9"; diff --git a/mysql-test/suite/parts/inc/partition_fail_t2.inc b/mysql-test/suite/parts/inc/partition_fail_t2.inc new file mode 100644 index 00000000000..3904ec8662c --- /dev/null +++ b/mysql-test/suite/parts/inc/partition_fail_t2.inc @@ -0,0 +1,31 @@ +# Include file to to test failure with error injection. +# To be used with WL#4445: EXCHANGE PARTITION WITH TABLE. +--eval $create_statement2 +--eval $insert_statement2 +SHOW CREATE TABLE t2; +--sorted_result +SELECT * FROM t2; +--eval $create_statement +--eval $insert_statement +--echo # State before failure +--replace_result #p# #P# +--list_files $DATADIR/test +SHOW CREATE TABLE t1; +--sorted_result +SELECT * FROM t1; +# accept all errors +--disable_abort_on_error +--replace_regex /#sqlx-[0-9a-f_]*/#sqlx-nnnn_nnnn/i +--eval $fail_statement +--enable_abort_on_error +--echo # State after failure +--replace_result #p# #P# +--list_files $DATADIR/test +SHOW CREATE TABLE t1; +--sorted_result +SELECT * FROM t1; +DROP TABLE t1; +SHOW CREATE TABLE t2; +--sorted_result +SELECT * FROM t2; +DROP TABLE t2; |