From deb0cd3f27eecb61c7a2747c26e0c17f5842c60d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 31 Jan 2013 15:51:26 +0100 Subject: [PATCH] avoid mtr errors for --plugin-add=EXAMPLE=$HA_EXAMPLE_SO when no ha_example.so is built --- mysql-test/suite.pm | 3 +++ .../{plugin_load_option-master.opt => plugin_load_option.opt} | 0 2 files changed, 3 insertions(+) rename mysql-test/t/{plugin_load_option-master.opt => plugin_load_option.opt} (100%) diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 43eb4f235e3..3dbacc7f8fc 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -28,6 +28,9 @@ sub skip_combinations { $skip{'include/have_ssl_crypto_functs.inc'} = 'Requires SSL' unless defined $::mysqld_variables{'ssl-ca'}; + $skip{'include/have_example_plugin.inc'} = 'Need example plugin' + unless $ENV{HA_EXAMPLE_SO}; + $skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS; $skip{'t/plugin_loaderr.test'} = 'needs compiled-in innodb' diff --git a/mysql-test/t/plugin_load_option-master.opt b/mysql-test/t/plugin_load_option.opt similarity index 100% rename from mysql-test/t/plugin_load_option-master.opt rename to mysql-test/t/plugin_load_option.opt