mirror of
https://github.com/MariaDB/server.git
synced 2025-05-31 08:42:45 +03:00
If one compiles innodb_plugin, then the tests in suite/innodb_plugin will use the plugin. If not and xtradb is used, the tests will use xtradb. mysql-test/include/have_innodb_plugin.inc: Test both for innodb_plugin and xtradb mysql-test/include/have_real_innodb_plugin.inc: Test if we are using innodb_plugin (but not xtradb) mysql-test/include/have_xtradb.inc: Test if xtradb is used mysql-test/lib/mtr_cases.pm: Enable easy testing of innodb_plugin mysql-test/mysql-test-run.pl: Added supression for difference between xtradb & innodb_plugin mysql-test/suite/innodb_plugin/r/innodb-index-ip.result: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb-index-xb.result: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb-index.result: Move tests away that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb-ip.result: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb-xb.result: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb.result: Move tests away that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/r/innodb_bug21704-xb.result: Test result differ for xtradb mysql-test/suite/innodb_plugin/r/innodb_bug46000.result: Remove (not needed) error message not given by MariaDB mysql-test/suite/innodb_plugin/r/innodb_bug49164-xb.result: Test result differs for xtradb mysql-test/suite/innodb_plugin/r/innodb_bug49164.result: Update results mysql-test/suite/innodb_plugin/r/innodb_bug53591.result: Remove (not needed) error message not given by MariaDB mysql-test/suite/innodb_plugin/r/innodb_bug54679.result: Updated result file mysql-test/suite/innodb_plugin/r/innodb_mysql.result: Updated result file mysql-test/suite/innodb_plugin/t/disabled.def: Disable some tests that depends on newer version of XtraDB mysql-test/suite/innodb_plugin/t/innodb-index-ip.test: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb-index-xb.test: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb-index.test: Move tests away that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb-ip.test: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb-xb.test: Tests from innodb-index that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb.test: Move tests away that gave different results for innodb_plugin and xtradb mysql-test/suite/innodb_plugin/t/innodb_bug21704-xb.test: Test result differ for xtradb mysql-test/suite/innodb_plugin/t/innodb_bug21704.test: Test result differ for xtradb mysql-test/suite/innodb_plugin/t/innodb_bug53591.test: Test results only makes sence for innodb_plugin (things works ok for xtradb) sql/sql_table.cc: Don't set HA_CREATE_USED_ROW_FORMAT for create table (only for update_create_info) if ROW_FORMAT is not used. storage/innodb_plugin/handler/ha_innodb.cc: Fixed wrong error message from innodb. This is needed as MariaDB properly handles errors from ha_index_init() storage/xtradb/handler/ha_innodb.cc: Update base information for XtraDB so that one can use informationschema.plugins to check if one is using XtraDB
92 lines
4.0 KiB
Plaintext
92 lines
4.0 KiB
Plaintext
SET GLOBAL innodb_file_format='Barracuda';
|
|
SET GLOBAL innodb_file_per_table=ON;
|
|
SET innodb_strict_mode=ON;
|
|
CREATE TABLE bug54679 (a INT) ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
|
|
SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables
|
|
WHERE TABLE_NAME='bug54679';
|
|
TABLE_NAME ROW_FORMAT CREATE_OPTIONS
|
|
bug54679 Compressed row_format=COMPRESSED
|
|
ALTER TABLE bug54679 ADD COLUMN b INT;
|
|
SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables
|
|
WHERE TABLE_NAME='bug54679';
|
|
TABLE_NAME ROW_FORMAT CREATE_OPTIONS
|
|
bug54679 Compressed row_format=COMPRESSED
|
|
DROP TABLE bug54679;
|
|
CREATE TABLE bug54679 (a INT) ENGINE=InnoDB;
|
|
SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables
|
|
WHERE TABLE_NAME='bug54679';
|
|
TABLE_NAME ROW_FORMAT CREATE_OPTIONS
|
|
bug54679 Compact
|
|
ALTER TABLE bug54679 KEY_BLOCK_SIZE=1;
|
|
SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables
|
|
WHERE TABLE_NAME='bug54679';
|
|
TABLE_NAME ROW_FORMAT CREATE_OPTIONS
|
|
bug54679 Compressed key_block_size=1
|
|
ALTER TABLE bug54679 ROW_FORMAT=REDUNDANT;
|
|
ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
|
|
SHOW WARNINGS;
|
|
Level Code Message
|
|
Warning 1478 InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
|
|
Error 1005 Can't create table '#sql-temporary' (errno: 1478)
|
|
DROP TABLE bug54679;
|
|
CREATE TABLE bug54679 (a INT) ENGINE=InnoDB ROW_FORMAT=REDUNDANT;
|
|
SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables
|
|
WHERE TABLE_NAME='bug54679';
|
|
TABLE_NAME ROW_FORMAT CREATE_OPTIONS
|
|
bug54679 Redundant row_format=REDUNDANT
|
|
ALTER TABLE bug54679 KEY_BLOCK_SIZE=2;
|
|
SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables
|
|
WHERE TABLE_NAME='bug54679';
|
|
TABLE_NAME ROW_FORMAT CREATE_OPTIONS
|
|
bug54679 Compressed row_format=REDUNDANT key_block_size=2
|
|
SET GLOBAL innodb_file_format=Antelope;
|
|
ALTER TABLE bug54679 KEY_BLOCK_SIZE=4;
|
|
ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
|
|
SHOW WARNINGS;
|
|
Level Code Message
|
|
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
|
|
Error 1005 Can't create table '#sql-temporary' (errno: 1478)
|
|
ALTER TABLE bug54679 ROW_FORMAT=DYNAMIC;
|
|
ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
|
|
SHOW WARNINGS;
|
|
Level Code Message
|
|
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
|
|
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
|
|
Warning 1478 InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
|
|
Error 1005 Can't create table '#sql-temporary' (errno: 1478)
|
|
DROP TABLE bug54679;
|
|
CREATE TABLE bug54679 (a INT) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
|
|
ERROR HY000: Can't create table 'test.bug54679' (errno: 1478)
|
|
SHOW WARNINGS;
|
|
Level Code Message
|
|
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
|
|
Error 1005 Can't create table 'test.bug54679' (errno: 1478)
|
|
CREATE TABLE bug54679 (a INT) ENGINE=InnoDB;
|
|
SET GLOBAL innodb_file_format=Barracuda;
|
|
SET GLOBAL innodb_file_per_table=OFF;
|
|
ALTER TABLE bug54679 KEY_BLOCK_SIZE=4;
|
|
ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
|
|
SHOW WARNINGS;
|
|
Level Code Message
|
|
Warning 1478 InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
|
|
Error 1005 Can't create table '#sql-temporary' (errno: 1478)
|
|
ALTER TABLE bug54679 ROW_FORMAT=DYNAMIC;
|
|
ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
|
|
SHOW WARNINGS;
|
|
Level Code Message
|
|
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
|
|
Error 1005 Can't create table '#sql-temporary' (errno: 1478)
|
|
DROP TABLE bug54679;
|
|
CREATE TABLE bug54679 (a INT) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
|
|
ERROR HY000: Can't create table 'test.bug54679' (errno: 1478)
|
|
SHOW WARNINGS;
|
|
Level Code Message
|
|
Warning 1478 InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
|
|
Error 1005 Can't create table 'test.bug54679' (errno: 1478)
|
|
SET GLOBAL innodb_file_per_table=ON;
|
|
CREATE TABLE bug54679 (a INT) ENGINE=InnoDB ROW_FORMAT=DYNAMIC;
|
|
DROP TABLE bug54679;
|
|
SET GLOBAL innodb_file_format=Antelope;
|
|
SET GLOBAL innodb_file_format_check=Antelope;
|
|
SET GLOBAL innodb_file_per_table=0;
|