diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
| commit | d61d6146438377f393a80b674a4cb6dd639b6a75 (patch) | |
| tree | 7b3561cb3ea2ad24d013e847680ec165f406387e /mysql-test/suite/sys_vars/t/plugin_dir_basic.test | |
| parent | 435c9b7d7cdd15102f0f5eddf51e37b3b3b09a27 (diff) | |
| parent | 3604b340e57ab54ccfab5187560e1d7f7eda0453 (diff) | |
| download | mariadb-git-d61d6146438377f393a80b674a4cb6dd639b6a75.tar.gz | |
mysql-5.5.18 merge
Diffstat (limited to 'mysql-test/suite/sys_vars/t/plugin_dir_basic.test')
| -rw-r--r-- | mysql-test/suite/sys_vars/t/plugin_dir_basic.test | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test index 8bb231c2c5e..59889f7ecb2 100644 --- a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test +++ b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test @@ -3,22 +3,20 @@ # # -# on windows it's <basedir>/lib/plugin -# on unix it's <basedir>/lib/mysql/plugin -# unless mtr sets it to $MYSQL_TEST_DIR/var/plugins +# Don't rely on being able to guess the correct default. +# -master.opt file for this test sets plugin_dir to a known directory # -let plugindir=$MYSQLTEST_VARDIR; ---replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ / select @@global.plugin_dir; --error ER_INCORRECT_GLOBAL_LOCAL_VAR select @@session.plugin_dir; ---replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ / show global variables like 'plugin_dir'; ---replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ / show session variables like 'plugin_dir'; ---replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ / select * from information_schema.global_variables where variable_name='plugin_dir'; ---replace_result $plugindir MYSQL_LIBDIR $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR /mysql/ / select * from information_schema.session_variables where variable_name='plugin_dir'; # |