1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

generalization of mtr to support suite.pm extensions:

* no automatic --loose-skip-innodb added by mtr based on the test name.
  instead loose-skip-innodb is now in the default_mysqld.cnf
* have_innodb_plugin.inc is changed to give a verbose "skip" message
  (instead of "require: true")
* My::Suite class. It's support in mtr, and everywhere
* support for suite.pm
* when sorting tests, take combinations into account
* support for SUITENAME_COMBINATIONS
* no special treatment for innodb_plugin in mtr_cases.pm
* two special pre-created config groups: ENV and OPT
* allow option names to start from #
* allow magic option to have an argument
* remove dead code
* fix @-substitution to works as expected
* new processes take the value of $opt_verbose automatically, no need to pass it to a constructor
* innodb_plugin suite uses suite.pm and combinations file to test as much as possible
  (innodb plugin, xtradb plugin, xtradb static - whatever available)
* besides test-master.opt and test-slave.opt a test.opt file is also
  loaded, both for master and slave
* .opt files for all included files are loaded too
* progress report in the xterm titlebar
This commit is contained in:
Sergei Golubchik
2010-08-17 11:14:46 +04:00
parent b87a737739
commit 8da7be6302
111 changed files with 708 additions and 681 deletions

View File

@ -0,0 +1,12 @@
[innodb_plugin]
ignore-builtin-innodb
plugin-load=$HA_INNODB_PLUGIN_SO
innodb
[xtradb_plugin]
ignore-builtin-innodb
plugin-load=$HA_XTRADB_SO
innodb
[xtradb]
innodb

View File

@ -0,0 +1,17 @@
package My::Suite::InnoDB_plugin;
@ISA = qw(My::Suite);
############# initialization ######################
my @combinations=('none');
push @combinations, 'innodb_plugin' if $ENV{HA_INNODB_PLUGIN_SO};
push @combinations, 'xtradb_plugin' if $ENV{HA_XTRADB_SO};
push @combinations, 'xtradb' if $::mysqld_variables{'innodb'} eq "ON";
$ENV{INNODB_PLUGIN_COMBINATIONS}=join ':', @combinations
unless $ENV{INNODB_PLUGIN_COMBINATIONS};
############# return an object ######################
bless { };

View File

@ -1 +1 @@
--innodb_lock_wait_timeout=2
--loose-innodb_lock_wait_timeout=2

View File

@ -1 +1 @@
--binlog_cache_size=32768 --innodb_lock_wait_timeout=1
--binlog_cache_size=32768 --loose-innodb_lock_wait_timeout=1

View File

@ -1 +1 @@
--innodb_lock_wait_timeout=2
--loose-innodb_lock_wait_timeout=2

View File

@ -1 +1 @@
--innodb-use-sys-malloc=true
--loose-innodb-use-sys-malloc=true

View File

@ -1 +1 @@
--innodb-autoinc-lock-mode=0
--loose-innodb-autoinc-lock-mode=0

View File

@ -1 +1 @@
--innodb --innodb_autoinc_lock_mode=0
--loose-innodb_autoinc_lock_mode=0

View File

@ -1 +1 @@
--innodb-file-per-table=1
--loose-innodb-file-per-table=1

View File

@ -1 +1 @@
--innodb_commit_concurrency=1
--loose-innodb_commit_concurrency=1

View File

@ -1 +1 @@
--log-bin --innodb-locks-unsafe-for-binlog --binlog-format=mixed
--log-bin=master-bin --loose-innodb-locks-unsafe-for-binlog --binlog-format=mixed

View File

@ -1 +1 @@
--innodb_lock_wait_timeout=1
--loose-innodb_lock_wait_timeout=1

View File

@ -1 +1 @@
--innodb-lock-wait-timeout=2
--loose-innodb-lock-wait-timeout=2

View File

@ -1 +1 @@
--innodb_lock_wait_timeout=1 --innodb_rollback_on_timeout=1
--loose-innodb_lock_wait_timeout=1 --loose-innodb_rollback_on_timeout=1

View File

@ -1 +1 @@
--innodb_lock_wait_timeout=2 --innodb_rollback_on_timeout
--loose-innodb_lock_wait_timeout=2 --loose-innodb_rollback_on_timeout