summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2016-04-27 21:50:54 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2016-04-28 22:25:11 +0200
commit8b94aec11af19fc711ed48f13410986814bc51a0 (patch)
tree2726f157ee885fae09b1d993e41a67486aa52a67
parent6345cd44184ede58c0b306290b4a2659dc557a08 (diff)
downloadmariadb-git-8b94aec11af19fc711ed48f13410986814bc51a0.tar.gz
Fix connect2 test, simulated errors do not work with thread cache
-rw-r--r--mysql-test/r/connect2.result1
-rw-r--r--mysql-test/t/connect2.test3
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/connect2.result b/mysql-test/r/connect2.result
index b68f7ae7c43..5430626a533 100644
--- a/mysql-test/r/connect2.result
+++ b/mysql-test/r/connect2.result
@@ -1,6 +1,7 @@
call mtr.add_suppression("Allocation failed");
SET @old_debug= @@session.debug;
set @old_thread_cache_size=@@global.thread_cache_size;
+set @@global.thread_cache_size=0;
connect con1,localhost,root,,test,,;
select 1;
1
diff --git a/mysql-test/t/connect2.test b/mysql-test/t/connect2.test
index b4614a65a91..9d2a438aa0a 100644
--- a/mysql-test/t/connect2.test
+++ b/mysql-test/t/connect2.test
@@ -7,7 +7,7 @@
call mtr.add_suppression("Allocation failed");
SET @old_debug= @@session.debug;
set @old_thread_cache_size=@@global.thread_cache_size;
-
+set @@global.thread_cache_size=0;
# Test connections to the
connect(con1,localhost,root,,test,,);
@@ -32,7 +32,6 @@ select 1;
disconnect con1;
# Test connections to the extra port.
-
connect(con1,localhost,root,,test,$MASTER_EXTRA_PORT,);
select 1;
disconnect con1;