database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '5.5' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-07-26 13:33:51 +02:00
parent 4177181e16 f8a1a262e2
commit 2382cd14a8
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/plugin.result
View File

@ -326,8 +326,7 @@ Warnings:
Warning 1300 Invalid utf8 character string: '\xF0\x9D\x8C\x86' Warning 1300 Invalid utf8 character string: '\xF0\x9D\x8C\x86'
install plugin foo soname 'admin𝌆'; install plugin foo soname 'admin𝌆';
ERROR HY000: No paths allowed for shared library ERROR HY000: No paths allowed for shared library
insert mysql.plugin values (); # End of 5.5 test
delete from mysql.plugin where name = '';
# #
# MDEV-5309 - RENAME TABLE does not check for existence of the table's # MDEV-5309 - RENAME TABLE does not check for existence of the table's
# engine # engine
@ -341,3 +340,4 @@ UNINSTALL PLUGIN example;
RENAME TABLE t1 TO t2; RENAME TABLE t1 TO t2;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
DROP TABLE t1; DROP TABLE t1;
# End of 10.1 test

3
mysql-test/r/plugin_not_embedded.result
View File

@ -11,3 +11,6 @@ UNINSTALL PLUGIN example;
DROP USER bug51770@localhost; DROP USER bug51770@localhost;
INSTALL PLUGIN example SONAME '../ha_example.so'; INSTALL PLUGIN example SONAME '../ha_example.so';
ERROR HY000: No paths allowed for shared library ERROR HY000: No paths allowed for shared library
insert mysql.plugin values ();
delete from mysql.plugin where name = '';
# End of 5.5 tests

10
mysql-test/t/plugin.test
View File

@ -260,13 +260,7 @@ select convert('admin𝌆' using utf8);
--error ER_UDF_NO_PATHS --error ER_UDF_NO_PATHS
install plugin foo soname 'admin𝌆'; install plugin foo soname 'admin𝌆';
# --echo # End of 5.5 test
# 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 # --echo #
--echo # MDEV-5309 - RENAME TABLE does not check for existence of the table's --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 --error ER_NO_SUCH_TABLE
RENAME TABLE t1 TO t2; RENAME TABLE t1 TO t2;
DROP TABLE t1; DROP TABLE t1;
--echo # End of 10.1 test

9
mysql-test/t/plugin_not_embedded.test
View File

@ -30,3 +30,12 @@ let $path = `select CONCAT_WS('/', '..', '$HA_EXAMPLE_SO')`;
--replace_regex /\.dll/.so/ --replace_regex /\.dll/.so/
--error ER_UDF_NO_PATHS --error ER_UDF_NO_PATHS
eval INSTALL PLUGIN example SONAME '$path'; 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