diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 13:15:44 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-26 13:19:49 +0200 |
| commit | f8a1a262e27bc9a42364c90601dd922dff9a210b (patch) | |
| tree | e2c3f2b6d92e118aad38211f23e03cf8f72b30e6 | |
| parent | cc37250a76472de4021bdfb395a17a9e736aecf6 (diff) | |
| download | mariadb-git-f8a1a262e27bc9a42364c90601dd922dff9a210b.tar.gz | |
Move the test not suitable for embedded.
| -rw-r--r-- | mysql-test/r/plugin.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/plugin_not_embedded.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/plugin.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/plugin_not_embedded.test | 8 |
4 files changed, 13 insertions, 9 deletions
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index 65e993b2766..3360b9f84f6 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -285,5 +285,4 @@ Warnings: Warning 1300 Invalid utf8 character string: 'F09D8C' install plugin foo soname 'admin𝌆'; ERROR HY000: No paths allowed for shared library -insert mysql.plugin values (); -delete from mysql.plugin where name = ''; +# End of 5.5 test diff --git a/mysql-test/r/plugin_not_embedded.result b/mysql-test/r/plugin_not_embedded.result index 27553366660..f675b167736 100644 --- a/mysql-test/r/plugin_not_embedded.result +++ b/mysql-test/r/plugin_not_embedded.result @@ -10,3 +10,6 @@ UNINSTALL PLUGIN example; DROP USER bug51770@localhost; INSTALL PLUGIN example SONAME '../ha_example.so'; ERROR HY000: No paths allowed for shared library +insert mysql.plugin values (); +delete from mysql.plugin where name = ''; +# End of 5.5 tests diff --git a/mysql-test/t/plugin.test b/mysql-test/t/plugin.test index 05347d221a0..e09f3a810cb 100644 --- a/mysql-test/t/plugin.test +++ b/mysql-test/t/plugin.test @@ -232,10 +232,4 @@ select convert('admin𝌆' using utf8); --error ER_UDF_NO_PATHS install plugin foo soname 'admin𝌆'; -# -# Bug#27302459: EMPTY VALUE IN MYSQL.PLUGIN TABLE CAUSES SERVER TO EXIT ON STARTUP -# -insert mysql.plugin values (); -source include/restart_mysqld.inc; -delete from mysql.plugin where name = ''; - +--echo # End of 5.5 test diff --git a/mysql-test/t/plugin_not_embedded.test b/mysql-test/t/plugin_not_embedded.test index 3e3bd6e86ca..6e1449239e9 100644 --- a/mysql-test/t/plugin_not_embedded.test +++ b/mysql-test/t/plugin_not_embedded.test @@ -30,3 +30,11 @@ let $path = `select CONCAT_WS('/', '..', '$HA_EXAMPLE_SO')`; --error ER_UDF_NO_PATHS eval INSTALL PLUGIN example SONAME '$path'; +# +# Bug#27302459: EMPTY VALUE IN MYSQL.PLUGIN TABLE CAUSES SERVER TO EXIT ON STARTUP +# +insert mysql.plugin values (); +source include/restart_mysqld.inc; +delete from mysql.plugin where name = ''; + +--echo # End of 5.5 tests |