diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-08-23 21:41:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-31 16:06:15 +0100 |
| commit | 9aac2bf86e606c536136c838249a8dbcf2575b39 (patch) | |
| tree | eb6842617a08665ba184ce974c639b34a91941d0 /mysql-test/main | |
| parent | 65180225b8c091ba8784b40ace5f5288ce069e5d (diff) | |
| download | mariadb-git-9aac2bf86e606c536136c838249a8dbcf2575b39.tar.gz | |
MDEV-16294 post-merge cleanups
Closes #757
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/plugin.result | 3 | ||||
| -rw-r--r-- | mysql-test/main/plugin.test | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/main/plugin.result b/mysql-test/main/plugin.result index edf09f39e44..38a03920039 100644 --- a/mysql-test/main/plugin.result +++ b/mysql-test/main/plugin.result @@ -332,10 +332,9 @@ RENAME TABLE t1 TO t2; ERROR 42S02: Table 'test.t1' doesn't exist DROP TABLE t1; # -# INSTALL IF NOT EXISTS [PLUGIN name] SONAME library / +# INSTALL IF NOT EXISTS PLUGIN name SONAME library / # UNINSTALL IF EXISTS PLUGIN|SONAME name # -# select PLUGIN_NAME,PLUGIN_STATUS,PLUGIN_TYPE from information_schema.plugins where plugin_library like 'ha_example%'; PLUGIN_NAME PLUGIN_STATUS PLUGIN_TYPE INSTALL PLUGIN IF NOT EXISTS example SONAME 'ha_example'; diff --git a/mysql-test/main/plugin.test b/mysql-test/main/plugin.test index ce320437fd2..273e1e064a5 100644 --- a/mysql-test/main/plugin.test +++ b/mysql-test/main/plugin.test @@ -267,10 +267,9 @@ RENAME TABLE t1 TO t2; DROP TABLE t1; --echo # ---echo # INSTALL IF NOT EXISTS [PLUGIN name] SONAME library / +--echo # INSTALL IF NOT EXISTS PLUGIN name SONAME library / --echo # UNINSTALL IF EXISTS PLUGIN|SONAME name --echo # ---echo # select PLUGIN_NAME,PLUGIN_STATUS,PLUGIN_TYPE from information_schema.plugins where plugin_library like 'ha_example%'; INSTALL PLUGIN IF NOT EXISTS example SONAME 'ha_example'; @@ -297,9 +296,12 @@ select PLUGIN_NAME,PLUGIN_STATUS,PLUGIN_TYPE from information_schema.plugins whe UNINSTALL SONAME IF EXISTS 'ha_example'; +--replace_regex /\.dll/.so/ UNINSTALL SONAME IF EXISTS 'ha_example'; +--replace_regex /\.dll/.so/ SHOW WARNINGS; select PLUGIN_NAME,PLUGIN_STATUS,PLUGIN_TYPE from information_schema.plugins where plugin_library like 'ha_example%'; +--replace_regex /\.dll/.so/ --error 1305 UNINSTALL SONAME 'ha_example'; |