Merge branch '10.2' into 10.3

This commit is contained in:
Monty 2019-09-02 14:06:56 +03:00
commit a071e0e029
671 changed files with 6035 additions and 9109 deletions

View file

@ -3,6 +3,7 @@
#
--source include/not_embedded.inc
set @save_log_warnings=@@log_warnings, @save_max_connections=@@max_connections;
SET GLOBAL log_warnings=4;
SET GLOBAL max_connections=10;
@ -28,5 +29,5 @@ SELECT 2;
SELECT 0;
show status like "Threads_connected";
SET GLOBAL log_warnings=default;
SET GLOBAL max_connections=default;
SET GLOBAL log_warnings=@save_log_warnings;
SET GLOBAL max_connections=@save_max_connections;