diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-01-20 13:35:48 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-01-20 13:35:48 +0200 |
| commit | f73bc0243ac13ce799d075b240dce63d0f5932c3 (patch) | |
| tree | 4cc56068c4f9ea66cef4c0776776c36077d8f426 /mysql-test/include | |
| parent | 752496999e661074613459c2f12bc73e21540386 (diff) | |
| download | mariadb-git-f73bc0243ac13ce799d075b240dce63d0f5932c3.tar.gz | |
Addendum to the fix for bug #11754014
- Fixed the checks to properly check for plugin_dir containing a trailing slash or backslash.
- Fixed a under-configuration in udf_skip_grants that was preventing the test
from running even when there was a udf plugin.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_example_plugin.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_semisync_plugin.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_simple_parser.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_udf.inc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/have_example_plugin.inc b/mysql-test/include/have_example_plugin.inc index 8920399555d..88f4e212102 100644 --- a/mysql-test/include/have_example_plugin.inc +++ b/mysql-test/include/have_example_plugin.inc @@ -15,7 +15,7 @@ if (!$EXAMPLE_PLUGIN) { # # Check if --plugin-dir was setup for exampledb # -if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$EXAMPLE_PLUGIN_OPT'`) { +if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$EXAMPLE_PLUGIN_OPT/'`) { --skip Example plugin requires that --plugin-dir is set to the example plugin dir (either the .opt file does not contain \$EXAMPLE_PLUGIN_OPT or another plugin is in use) } enable_query_log; diff --git a/mysql-test/include/have_semisync_plugin.inc b/mysql-test/include/have_semisync_plugin.inc index 95899f559aa..1cd3b30be1c 100644 --- a/mysql-test/include/have_semisync_plugin.inc +++ b/mysql-test/include/have_semisync_plugin.inc @@ -16,6 +16,6 @@ if (!$SEMISYNC_MASTER_PLUGIN) # # Check if --plugin-dir was setup for semisync # -if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$SEMISYNC_PLUGIN_OPT'`) { +if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$SEMISYNC_PLUGIN_OPT/'`) { --skip SEMISYNC plugin requires that --plugin-dir is set to the semisync plugin dir (either the .opt file does not contain \$SEMISYNC_PLUGIN_OPT or another plugin is in use) } diff --git a/mysql-test/include/have_simple_parser.inc b/mysql-test/include/have_simple_parser.inc index d077916c5e7..0cedad27a77 100644 --- a/mysql-test/include/have_simple_parser.inc +++ b/mysql-test/include/have_simple_parser.inc @@ -15,6 +15,6 @@ if (!$SIMPLE_PARSER) { # # Check if --plugin-dir was setup for simple parser # -if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$SIMPLE_PARSER_OPT'`) { +if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$SIMPLE_PARSER_OPT/'`) { --skip simple parser requires that --plugin-dir is set to the udf plugin dir (either the .opt file does not contain \$UDF_EXAMPLE_LIB_OPT or another plugin is in use) } diff --git a/mysql-test/include/have_udf.inc b/mysql-test/include/have_udf.inc index 5c404b03729..993b9e13fdb 100644 --- a/mysql-test/include/have_udf.inc +++ b/mysql-test/include/have_udf.inc @@ -15,6 +15,6 @@ if (!$UDF_EXAMPLE_LIB) { # # Check if --plugin-dir was setup for udf # -if (`SELECT CONCAT('--plugin-dir=', @@plugin_dir) != '$UDF_EXAMPLE_LIB_OPT'`) { +if (`SELECT CONCAT('--plugin-dir=', REPLACE(@@plugin_dir, '\\\\', '/')) != '$UDF_EXAMPLE_LIB_OPT/'`) { --skip UDF requires that --plugin-dir is set to the udf plugin dir (either the .opt file does not contain \$UDF_EXAMPLE_LIB_OPT or another plugin is in use) } |