diff options
| -rw-r--r-- | mysql-test/r/plugin.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/plugin_not_embedded.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/plugin.test | 10 | ||||
| -rw-r--r-- | mysql-test/t/plugin_not_embedded.test | 9 |
4 files changed, 17 insertions, 9 deletions
diff --git a/mysql-test/r/plugin.result b/mysql-test/r/plugin.result index c5b4d9c7309..93a150ae424 100644 --- a/mysql-test/r/plugin.result +++ b/mysql-test/r/plugin.result @@ -326,8 +326,7 @@ Warnings: Warning 1300 Invalid utf8 character string: '\xF0\x9D\x8C\x86' 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 # # MDEV-5309 - RENAME TABLE does not check for existence of the table's # engine @@ -341,3 +340,4 @@ UNINSTALL PLUGIN example; RENAME TABLE t1 TO t2; ERROR 42S02: Table 'test.t1' doesn't exist DROP TABLE t1; +# End of 10.1 test diff --git a/mysql-test/r/plugin_not_embedded.result b/mysql-test/r/plugin_not_embedded.result index 8106abc497f..b31eb80f1ae 100644 --- a/mysql-test/r/plugin_not_embedded.result +++ b/mysql-test/r/plugin_not_embedded.result @@ -11,3 +11,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 956edcc804a..e1a17d49174 100644 --- a/mysql-test/t/plugin.test +++ b/mysql-test/t/plugin.test @@ -260,13 +260,7 @@ 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 --echo # --echo # MDEV-5309 - RENAME TABLE does not check for existence of the table's @@ -280,3 +274,5 @@ UNINSTALL PLUGIN example; --error ER_NO_SUCH_TABLE RENAME TABLE t1 TO t2; DROP TABLE t1; + +--echo # End of 10.1 test diff --git a/mysql-test/t/plugin_not_embedded.test b/mysql-test/t/plugin_not_embedded.test index 3b4129b6b6b..a9126053f18 100644 --- a/mysql-test/t/plugin_not_embedded.test +++ b/mysql-test/t/plugin_not_embedded.test @@ -30,3 +30,12 @@ let $path = `select CONCAT_WS('/', '..', '$HA_EXAMPLE_SO')`; --replace_regex /\.dll/.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 |