diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/mdev375.result | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mdev375.result')
| -rw-r--r-- | mysql-test/main/mdev375.result | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/main/mdev375.result b/mysql-test/main/mdev375.result index 0ae8375ff24..3fdf97f5c24 100644 --- a/mysql-test/main/mdev375.result +++ b/mysql-test/main/mdev375.result @@ -1,3 +1,4 @@ +set @save_log_warnings=@@log_warnings, @save_max_connections=@@max_connections; SET GLOBAL log_warnings=4; SET GLOBAL max_connections=10; connect tmp_con1,localhost,root,,; @@ -24,5 +25,5 @@ SELECT 0; show status like "Threads_connected"; Variable_name Value Threads_connected 11 -SET GLOBAL log_warnings=default; -SET GLOBAL max_connections=default; +SET GLOBAL log_warnings=@save_log_warnings; +SET GLOBAL max_connections=@save_max_connections; |