diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-12-15 18:24:11 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-12-15 18:24:11 +0100 |
| commit | 2217717ff65f01409ec9840eeaa4951c62652612 (patch) | |
| tree | c93a013d729b8e0c3cb1e8e6c8b041c2e36ba19e /mysql-test/t/plugin_load.test | |
| parent | 17d63e5be2044f4e31b39cae3605ff9f04692aa5 (diff) | |
| download | mariadb-git-2217717ff65f01409ec9840eeaa4951c62652612.tar.gz | |
MDEV-3860 backport --plugin-load-add (and related mysql-test changes)
revno: 3383
revision-id: georgi.kodinov@oracle.com-20110818083108-qa3h3ufqu4zne80a
committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
timestamp: Thu 2011-08-18 11:31:08 +0300
message:
Bug #11766001: 59026: ALLOW MULTIPLE --PLUGIN-LOAD OPTIONS
Implemented support for a new command line option :
--plugin-load-add=<comma-separated-name-equals-value-list>
This option takes the same type of arguments that --plugin-load does
and complements --plugin-load (that continues to operate as before) by
appending its argument to the list specified by --plugin-load.
So --plugin-load can be considered a composite option consisting of
resetting the plugin load list and then calling --plugin-load-add to process
the argument.
Note that the order in which you specify --plugin-load and --plugin-load-add
is important : "--plugin-load=x --plugin-load-add=y" will be equivalent to
"--plugin-load=x,y" whereas "--plugin-load-add=y --plugin-load=x" will be
equivalent to "plugin-load=x".
Incompatible change : the --help --verbose command will no longer print the
--plugin-load variable's values (as it doesn't have one). Otherwise both --plugin-load
and --plugin-load-add are mentioned in it.
Diffstat (limited to 'mysql-test/t/plugin_load.test')
| -rw-r--r-- | mysql-test/t/plugin_load.test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/plugin_load.test b/mysql-test/t/plugin_load.test index 97b2afbe219..fdae622645a 100644 --- a/mysql-test/t/plugin_load.test +++ b/mysql-test/t/plugin_load.test @@ -1,4 +1,18 @@ --source include/not_windows_embedded.inc --source include/have_example_plugin.inc +if (!$MYPLUGLIB_SO) { + --echo needs SIMPLE_PARSER plugin +} +if (!$LIBDAEMON_EXAMPLE_SO) { + --echo needs DAEMON_EXAMPLE plugin +} +if (!$DIALOG_EXAMPLES_SO) { + --echo needs dialog examples plugins +} SELECT @@global.example_enum_var = 'e2'; + +--sorted_result +select plugin_name, plugin_status from information_schema.plugins + where plugin_name in ('SIMPLE_PARSER', 'EXAMPLE', + 'DAEMON_EXAMPLE', 'TWO_QUESTIONS', 'THREE_ATTEMPTS'); |