Skip to content

M
MariaDB
Commit c18bf481 authored by Alice Sherepa's avatar Alice Sherepa
Browse files
Options

innodb suite <innodb-tablespaces

parent f37ca394
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 43 deletions
mysql-test/suite/innodb/r/innodb-status-output.result
View file @ c18bf481
......@@ -42,6 +42,8 @@ SELECT SLEEP(30);
SLEEP(30)
0
COMMIT;
FOUND /INNODB MONITOR OUTPUT/ in innodb-status-output.err
NOT FOUND /SELECT SLEEP.*\nTABLE LOCK.*\nRECORD LOCKS space id/ in innodb-status-output.err
BEGIN;
SELECT * FROM t FOR UPDATE;
a
......@@ -51,6 +53,7 @@ SELECT SLEEP(30);
SLEEP(30)
0
COMMIT;
FOUND /ready for connections.*\nVersion:.*\n.*Normal shutdown/ in innodb-status-output.err
BEGIN;
SELECT * FROM t FOR UPDATE;
a
......@@ -60,4 +63,6 @@ SELECT SLEEP(30);
SLEEP(30)
0
COMMIT;
FOUND /INNODB MONITOR OUTPUT/ in innodb-status-output.err
NOT FOUND /SELECT SLEEP.*\n------/ in innodb-status-output.err
DROP TABLE t;
mysql-test/suite/innodb/r/innodb-tablespace.result
View file @ c18bf481
......@@ -8,11 +8,12 @@ SET default_storage_engine=InnoDB;
#
SET SESSION innodb_strict_mode = ON;
CREATE TABLE t1 (a int KEY, b text) INDEX DIRECTORY='MYSQL_TMP_DIR/alt_dir';
ERROR HY000: Table storage engine for 't1' doesn't have this option
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: INDEX DIRECTORY is not supported
Error 1031 Table storage engine for 't1' doesn't have this option
Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options")
Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB
#
# Without strict mode, INDEX DIRECTORY is just ignored
#
......@@ -37,11 +38,12 @@ DROP TABLE t1;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table=OFF;
CREATE TABLE t1 (a int KEY, b text) DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
ERROR HY000: Table storage engine for 't1' doesn't have this option
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: DATA DIRECTORY requires innodb_file_per_table.
Error 1031 Table storage engine for 't1' doesn't have this option
Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options")
Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB
#
# Without strict mode, DATA DIRECTORY without innodb_file_per_table=ON is just ignored.
#
......@@ -105,9 +107,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/t1 Antelope Compact or Redundant
SELECT path FROM information_schema.innodb_sys_datafiles
WHERE path LIKE '%test%' ORDER BY space;
......@@ -127,9 +126,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
SELECT path FROM information_schema.innodb_sys_datafiles
WHERE path LIKE '%test%' ORDER BY space;
path
......@@ -159,9 +155,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/t1 Antelope Compact or Redundant
SELECT path FROM information_schema.innodb_sys_datafiles
WHERE path LIKE '%test%' ORDER BY space;
......@@ -191,9 +184,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/t1 Antelope Compact or Redundant
SELECT path FROM information_schema.innodb_sys_datafiles
WHERE path LIKE '%test%' ORDER BY space;
......@@ -224,9 +214,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/t2 Antelope Compact or Redundant
SELECT path FROM information_schema.innodb_sys_datafiles
WHERE path LIKE '%test%' ORDER BY space;
......@@ -257,9 +244,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/t2 Antelope Compact or Redundant
test/t3 Antelope Compact or Redundant
SELECT path FROM information_schema.innodb_sys_datafiles
......@@ -286,9 +270,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
SELECT path FROM information_schema.innodb_sys_datafiles
WHERE path LIKE '%test%' ORDER BY space;
path
......@@ -320,11 +301,12 @@ ERROR HY000: Incorrect arguments to DATA DIRECTORY
# TEMPORARY tables are incompatible with DATA DIRECTORY
SET SESSION innodb_strict_mode = ON;
CREATE TEMPORARY TABLE t1 (a int KEY, b text) engine=InnoDB DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
ERROR HY000: Table storage engine for 't1' doesn't have this option
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
SHOW WARNINGS;
Level Code Message
Warning 1478 InnoDB: DATA DIRECTORY cannot be used for TEMPORARY tables.
Error 1031 Table storage engine for 't1' doesn't have this option
Error 1005 Can't create table `test`.`t1` (errno: 140 "Wrong create options")
Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB
SET SESSION innodb_strict_mode = OFF;
CREATE TEMPORARY TABLE t1 (a int KEY, b text) engine=InnoDB DATA DIRECTORY='MYSQL_TMP_DIR/alt_dir';
Warnings:
......@@ -444,9 +426,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/emp#p#east Antelope Compact or Redundant
test/emp#p#north Antelope Compact or Redundant
test/emp#p#west Antelope Compact or Redundant
......@@ -501,9 +480,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/emp#p#east Antelope Compact or Redundant
test/emp#p#north Antelope Compact or Redundant
SELECT path FROM information_schema.innodb_sys_datafiles
......@@ -557,9 +533,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/emp#p#east Antelope Compact or Redundant
test/emp#p#north Antelope Compact or Redundant
test/emp#p#west Antelope Compact or Redundant
......@@ -617,9 +590,6 @@ ORDER BY name;
name file_format row_format
mysql/innodb_index_stats Antelope Compact or Redundant
mysql/innodb_table_stats Antelope Compact or Redundant
mysql/slave_master_info Antelope Compact or Redundant
mysql/slave_relay_log_info Antelope Compact or Redundant
mysql/slave_worker_info Antelope Compact or Redundant
test/emp#p#east Antelope Compact or Redundant
test/emp#p#north Antelope Compact or Redundant
test/emp#p#west Antelope Compact or Redundant
......
mysql-test/suite/innodb/t/innodb-system-table-view.test
View file @ c18bf481
......@@ -11,7 +11,7 @@ let $MYSQLD_DATADIR= `select @@datadir`;
LET $innodb_file_format_orig=`select @@innodb_file_format`;
LET $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
--enable_query_log
SELECT table_id, name FROM information_schema.innodb_sys_tables;
# The IDs of mysql.innodb_table_stats and mysql.innodb_index_stats are
# unpredictable, probably they depend on whether mtr has created the
# database for this test from scratch or is using a previously created
......
mysql-test/suite/innodb/t/innodb-tablespace.opt 0 → 100644
View file @ c18bf481
--innodb-sys-tablespaces
--innodb-sys-datafiles
\ No newline at end of file
mysql-test/suite/innodb/t/innodb-tablespace.test
View file @ c18bf481
......@@ -28,7 +28,7 @@ LET $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
--echo #
SET SESSION innodb_strict_mode = ON;
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error ER_ILLEGAL_HA
--error ER_CANT_CREATE_TABLE
eval CREATE TABLE t1 (a int KEY, b text) $index_directory_clause;
SHOW WARNINGS;
......@@ -48,7 +48,7 @@ DROP TABLE t1;
SET SESSION innodb_strict_mode = ON;
SET GLOBAL innodb_file_per_table=OFF;
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error ER_ILLEGAL_HA
--error ER_CANT_CREATE_TABLE
eval CREATE TABLE t1 (a int KEY, b text) $data_directory_clause;
SHOW WARNINGS;
......@@ -239,7 +239,7 @@ eval CREATE TABLE t1 (a int KEY, b text) DATA DIRECTORY '$MYSQLD_DATADIR/test';
--echo # TEMPORARY tables are incompatible with DATA DIRECTORY
SET SESSION innodb_strict_mode = ON;
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
--error ER_ILLEGAL_HA
--error ER_CANT_CREATE_TABLE
eval CREATE TEMPORARY TABLE t1 (a int KEY, b text) engine=InnoDB $data_directory_clause;
SHOW WARNINGS;
SET SESSION innodb_strict_mode = OFF;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7