1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InnoDB plugin is built-in: remove test code which depended on the plugin property

Browse Source
This commit is contained in:
Guilhem Bichot 2009-08-05 12:07:41 +02:00
parent dec0dbc83c
commit 13a87951e9
11 changed files with 1 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
mysql-test/lib/mtr_cases.pm
View File

@ -476,65 +476,6 @@ sub collect_one_suite($)
}
}
# ----------------------------------------------------------------------
# Testing InnoDB plugin.
# ----------------------------------------------------------------------
my $lib_innodb_plugin=
mtr_file_exists(::vs_config_dirs('storage/innodb_plugin', 'ha_innodb_plugin.dll'),
"$::basedir/storage/innodb_plugin/.libs/ha_innodb_plugin.so",
"$::basedir/lib/mysql/plugin/ha_innodb_plugin.so",
"$::basedir/lib/mysql/plugin/ha_innodb_plugin.dll");
if ($::mysql_version_id >= 50100 && !(IS_WINDOWS && $::opt_embedded_server) &&
$lib_innodb_plugin)
{
my @new_cases;
foreach my $test (@cases)
{
next if ($test->{'skip'} || !$test->{'innodb_test'});
# Exceptions
next if ($test->{'name'} eq 'main.innodb'); # Failed with wrong errno (fk)
# innodb_file_per_table is rw with innodb_plugin
next if ($test->{'name'} eq 'sys_vars.innodb_file_per_table_basic');
# innodb_lock_wait_timeout is rw with innodb_plugin
next if ($test->{'name'} eq 'sys_vars.innodb_lock_wait_timeout_basic');
# Diff around innodb_thread_concurrency variable
next if ($test->{'name'} eq 'sys_vars.innodb_thread_concurrency_basic');
# Copy test options
my $new_test= My::Test->new();
while (my ($key, $value) = each(%$test))
{
if (ref $value eq "ARRAY")
{
push(@{$new_test->{$key}}, @$value);
}
else
{
$new_test->{$key}= $value;
}
}
my $plugin_filename= basename($lib_innodb_plugin);
push(@{$new_test->{master_opt}}, '--ignore-builtin-innodb');
push(@{$new_test->{master_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
push(@{$new_test->{master_opt}}, "--plugin_load=innodb=$plugin_filename;innodb_locks=$plugin_filename");
push(@{$new_test->{slave_opt}}, '--ignore-builtin-innodb');
push(@{$new_test->{slave_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
push(@{$new_test->{slave_opt}}, "--plugin_load=innodb=$plugin_filename;innodb_locks=$plugin_filename");
if ($new_test->{combination})
{
$new_test->{combination}.= ' + InnoDB plugin';
}
else
{
$new_test->{combination}= 'InnoDB plugin';
}
push(@new_cases, $new_test);
}
push(@cases, @new_cases);
}
# ----------------------------------------------------------------------
# End of testing InnoDB plugin.
# ----------------------------------------------------------------------
optimize_cases(\@cases);
#print_testcases(@cases);

4
mysql-test/suite/innodb/include/have_innodb_plugin.inc
View File

@ -1,4 +0,0 @@
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
mysql-test/suite/innodb/t/innodb-analyze.test
View File

@ -4,7 +4,6 @@
#
-- 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
mysql-test/suite/innodb/t/innodb-timeout.test
View File

@ -1,5 +1,4 @@
-- 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
mysql-test/suite/innodb/t/innodb-use-sys-malloc.test
View File

@ -1,5 +1,4 @@
--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
mysql-test/suite/innodb/t/innodb-zip.test
View File

@ -1,5 +1,4 @@
-- 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`;

1
mysql-test/suite/innodb/t/innodb_bug36169.test
View File

@ -4,7 +4,6 @@
#
-- 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;

1
mysql-test/suite/innodb/t/innodb_bug36172.test
View File

@ -4,7 +4,6 @@
-- source include/not_embedded.inc
-- source include/have_innodb.inc
-- source suite/innodb/include/have_innodb_plugin.inc
SET storage_engine=InnoDB;

1
mysql-test/suite/innodb/t/innodb_file_format.test
View File

@ -1,5 +1,4 @@
-- source include/have_innodb.inc
-- source suite/innodb/include/have_innodb_plugin.inc
let $format=`select @@innodb_file_format`;
let $innodb_file_format_check_orig=`select @@innodb_file_format_check`;

1
mysql-test/suite/innodb/t/innodb_information_schema.test
View File

@ -4,7 +4,6 @@
#
-- source include/have_innodb.inc
-- source suite/innodb/include/have_innodb_plugin.inc
-- disable_query_log
-- disable_result_log

1
storage/innodb_plugin/plug.in
View File

@ -17,6 +17,7 @@
MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine],
[Transactional Tables using InnoDB], [max,max-no-ndb])
MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
MYSQL_PLUGIN_STATIC(innodb_plugin, [libinnobase.a])
MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la])
MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
AC_CHECK_HEADERS(sched.h)