mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
This patch implements testing InnoDB plugin milestone.
mysql-test/lib/mtr_cases.pm: Expand test cases list with test cases to test InnoDB plugin. mysql-test/mysql-test-run.pl: Added "innodb" suite to default list of suites. mysql-test/suite/innodb/include/have_innodb_plugin.inc: This file determines if innodb plugin is available. mysql-test/suite/innodb/my.cnf: Removed temporary my.cnf, which was added for testing. Not needed anymore - options are substituted by mtr. mysql-test/suite/innodb/t/innodb-analyze.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb-timeout.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb-use-sys-malloc-master.opt: Use "loose" prefix with mysqld options. This makes this test skipped properly when no innodb is available. mysql-test/suite/innodb/t/innodb-use-sys-malloc.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb-zip.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb_bug36169.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb_bug36172.test: This test can only be run with InnoDB plugin. mysql-test/suite/innodb/t/innodb_information_schema.test: This test can only be run with InnoDB plugin.
This commit is contained in:
4
mysql-test/suite/innodb/include/have_innodb_plugin.inc
Normal file
4
mysql-test/suite/innodb/include/have_innodb_plugin.inc
Normal file
@ -0,0 +1,4 @@
|
||||
disable_query_log;
|
||||
--require r/true.require
|
||||
select (PLUGIN_LIBRARY LIKE 'ha_innodb_plugin%') as `TRUE` from information_schema.plugins where PLUGIN_NAME='InnoDB';
|
||||
enable_query_log;
|
@ -1,6 +0,0 @@
|
||||
!include include/default_my.cnf
|
||||
|
||||
[mysqld]
|
||||
ignore-builtin-innodb
|
||||
plugin-dir=../storage/innodb_plugin/.libs/
|
||||
plugin_load=innodb=ha_innodb_plugin.so:innodb_locks=ha_innodb_plugin.so
|
@ -4,6 +4,7 @@
|
||||
#
|
||||
|
||||
-- source include/have_innodb.inc
|
||||
-- source suite/innodb/include/have_innodb_plugin.inc
|
||||
|
||||
# we care only that the following SQL commands do not produce errors
|
||||
# and do not crash the server
|
||||
|
@ -1,4 +1,5 @@
|
||||
-- source include/have_innodb.inc
|
||||
-- source suite/innodb/include/have_innodb_plugin.inc
|
||||
|
||||
let $timeout=`select @@innodb_lock_wait_timeout`;
|
||||
set global innodb_lock_wait_timeout=42;
|
||||
|
@ -1,2 +1,2 @@
|
||||
--innodb-use-sys-malloc=true
|
||||
--innodb-use-sys-malloc=true
|
||||
--loose-innodb-use-sys-malloc=true
|
||||
--loose-innodb-use-sys-malloc=true
|
||||
|
@ -1,4 +1,5 @@
|
||||
--source include/have_innodb.inc
|
||||
-- source suite/innodb/include/have_innodb_plugin.inc
|
||||
|
||||
#display current value of innodb_use_sys_malloc
|
||||
SELECT @@GLOBAL.innodb_use_sys_malloc;
|
||||
|
@ -1,4 +1,5 @@
|
||||
-- source include/have_innodb.inc
|
||||
-- source suite/innodb/include/have_innodb_plugin.inc
|
||||
|
||||
let $per_table=`select @@innodb_file_per_table`;
|
||||
let $format=`select @@innodb_file_format`;
|
||||
|
@ -4,6 +4,7 @@
|
||||
#
|
||||
|
||||
-- source include/have_innodb.inc
|
||||
-- source suite/innodb/include/have_innodb_plugin.inc
|
||||
|
||||
SET GLOBAL innodb_file_format='Barracuda';
|
||||
SET GLOBAL innodb_file_per_table=ON;
|
||||
|
@ -4,6 +4,7 @@
|
||||
|
||||
-- source include/not_embedded.inc
|
||||
-- source include/have_innodb.inc
|
||||
-- source suite/innodb/include/have_innodb_plugin.inc
|
||||
|
||||
SET storage_engine=InnoDB;
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
#
|
||||
|
||||
-- source include/have_innodb.inc
|
||||
-- source suite/innodb/include/have_innodb_plugin.inc
|
||||
|
||||
-- disable_query_log
|
||||
-- disable_result_log
|
||||
|
Reference in New Issue
Block a user