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

Merge branch '10.3' into 10.4

This commit is contained in:
Sergei Golubchik
2019-09-06 11:53:10 +02:00
750 changed files with 13360 additions and 14832 deletions

View File

@ -3,7 +3,9 @@
#
# Can't test with embedded server that doesn't support grants
-- source include/not_embedded.inc
--source include/not_embedded.inc
--source include/default_charset.inc
set @@global.character_set_server=@@session.character_set_server;
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
@ -1074,3 +1076,5 @@ disconnect u1;
connection default;
DROP DATABASE u1;
DROP USER u1@localhost;
set @@global.character_set_server=@save_character_set_server;