summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2012-01-02 10:13:53 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2012-01-02 10:13:53 +0100
commited946a7e895dd4a741c4ff3a6108a3c3cd329c9b (patch)
treede38010c65ba15e118353687eada3cabb3750667 /mysql-test/t
parentc216c9f0f039836f2b8c9edad0884511303101fd (diff)
downloadmariadb-git-ed946a7e895dd4a741c4ff3a6108a3c3cd329c9b.tar.gz
fix test
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/pool_of_threads.cnf6
-rw-r--r--mysql-test/t/pool_of_threads.test3
2 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/t/pool_of_threads.cnf b/mysql-test/t/pool_of_threads.cnf
index ed4ad501c9d..c03e1da6450 100644
--- a/mysql-test/t/pool_of_threads.cnf
+++ b/mysql-test/t/pool_of_threads.cnf
@@ -2,13 +2,13 @@
[mysqld.1]
loose-thread-handling= pool-of-threads
-loose-thread_pool_size= 1
-loose-thread_pool_max_threads= 2
+loose-thread_pool_size= 2
+loose-thread_pool_max_threads= 2
extra-port= @ENV.MASTER_EXTRA_PORT
extra-max-connections=1
[client]
-connect-timeout= 2
+connect-timeout= 2
[ENV]
MASTER_EXTRA_PORT= @OPT.port
diff --git a/mysql-test/t/pool_of_threads.test b/mysql-test/t/pool_of_threads.test
index caedb56dd2b..23ac8e063e2 100644
--- a/mysql-test/t/pool_of_threads.test
+++ b/mysql-test/t/pool_of_threads.test
@@ -16,11 +16,12 @@
# on normal port fails due to--thread-pool-max_threads=2
connection default;
send SELECT sleep(5);
+--sleep 1
connect(con2,localhost,root,,);
connection con2;
send SELECT sleep(5);
---sleep 1
+--sleep 0.5
--disable_abort_on_error
--disable_result_log