summaryrefslogtreecommitdiff
path: root/mysql-test/main/mdev375.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-09-02 14:06:56 +0300
committerMonty <monty@mariadb.org>2019-09-03 13:17:32 +0300
commita071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch)
treeb592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/mdev375.test
parentb0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff)
parent9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff)
downloadmariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mdev375.test')
-rw-r--r--mysql-test/main/mdev375.test5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/main/mdev375.test b/mysql-test/main/mdev375.test
index 759f7bd31f0..9e35190b927 100644
--- a/mysql-test/main/mdev375.test
+++ b/mysql-test/main/mdev375.test
@@ -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;