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 '10.3' into 10.4

Browse Source
This commit is contained in:
Sergei Golubchik
2019-09-06 11:53:10 +02:00
parent 18af13b88b 2842c36985
commit 244f0e6dd8
750 changed files with 13360 additions and 14832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/main/mysql_client_test.result
View File

@ -1,3 +1,9 @@
SET @save_character_set_client= @@global.character_set_client;
SET @save_collation_connection= @@global.collation_connection;
SET @@global.character_set_server= @@character_set_server;
SET @@global.collation_server= @@collation_server;
SET @@global.character_set_client= @@character_set_server;
SET @@global.collation_connection= @@collation_server;
SET @old_general_log= @@global.general_log;
SET @old_slow_query_log= @@global.slow_query_log;
call mtr.add_suppression(" Error reading file './client_test_db/test_frm_bug.frm'");
@ -246,3 +252,7 @@ ANALYZE JSON DELETE number of fields: 1
SET @@global.general_log= @old_general_log;
SET @@global.slow_query_log= @old_slow_query_log;
SET @@global.character_set_server= @save_character_set_server;
SET @@global.collation_server= @save_collation_server;
SET @@global.character_set_client= @save_character_set_client;
SET @@global.collation_connection= @save_collation_connection;