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

Merge 10.10 into 10.11

This commit is contained in:
Marko Mäkelä
2023-01-11 11:13:56 +02:00
207 changed files with 3276 additions and 2334 deletions

View File

@ -914,8 +914,9 @@ DROP USER 'tester';
DROP USER 'Tester';
DROP DATABASE B48872;
--echo End of 5.0 tests.
--echo #
--echo # End of 5.0 tests.
--echo #
--echo #
--echo # Test for bug#57061 "User without privilege on routine can discover
@ -1084,9 +1085,8 @@ DROP USER u1@localhost;
set @@global.character_set_server=@save_character_set_server;
--echo #
--echo # Start of 10.5 tests
--echo # End of 10.2 tests
--echo #
--echo #
@ -1106,7 +1106,20 @@ CALL p1();
DROP PROCEDURE p1;
DROP USER foo@localhost;
--echo #
--echo # End of 10.5 tests
--echo #
--echo #
--echo # MDEV-29852 SIGSEGV in mysql_create_routine or is_acl_user on 2nd execution, ASAN use-after-poison in get_current_user (sql_acl.cc)
--echo #
set @cmd:="create definer=u function f(i int) returns char binary reads sql data return concat (1,i)";
prepare s from @cmd;
execute s;
--error ER_SP_ALREADY_EXISTS
execute s;
drop function f;
--echo #
--echo # End of 10.6 tests
--echo #