diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
commit | 6c716007d13ffd74bb5c3dd7c512d4d7026a23d8 (patch) | |
tree | 0bab5217d4ea83929d314c2ce29f962a949c95c8 /mysql-test/suite/sys_vars/t/plugin_dir_basic.test | |
parent | c3eabe01fc30ee38f64b17fabfd58c6328751660 (diff) | |
parent | e7441f0b602735e2c40b0e0e7cfb01a2443aaa5a (diff) | |
download | mariadb-git-6c716007d13ffd74bb5c3dd7c512d4d7026a23d8.tar.gz |
Manual merge of WL#4738 from mysql-next-mr:
- backported code that handles %f/%g arguments in
my_vsnprintf.c from 6.0
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c
from 6.0
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt()
- removed unnecessary "--replace-result"s for Windows in
mysql-test/suite/sys_vars/t/long_query_time_basic.test
- some test results adjustments
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 | 29 |
1 files changed, 29 insertions, 0 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 new file mode 100644 index 00000000000..d714950c807 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test @@ -0,0 +1,29 @@ +# +# only global +# + +# +# on windows it's <basedir>/lib/plugin +# on unix it's <basedir>/lib/mysql/plugin +# +--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +select @@global.plugin_dir; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +select @@session.plugin_dir; +--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +show global variables like 'plugin_dir'; +--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +show session variables like 'plugin_dir'; +--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +select * from information_schema.global_variables where variable_name='plugin_dir'; +--replace_result $MYSQL_LIBDIR MYSQL_LIBDIR /mysql/ / +select * from information_schema.session_variables where variable_name='plugin_dir'; + +# +# show that it's read-only +# +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +set global plugin_dir=1; +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +set session plugin_dir=1; + |