summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-03-23 15:10:08 +0200
committerMonty <monty@mariadb.org>2016-03-23 15:11:30 +0200
commit06b455645258031cfc5d0810c28311307e9700f3 (patch)
treee09cd8e7218ca3269813ca8ca4be33bc2ccfe705
parent02d75ae1fd24f43f02f963a39e8df5644f8873d8 (diff)
downloadmariadb-git-06b455645258031cfc5d0810c28311307e9700f3.tar.gz
Fixed failures from changing values of thread_stack and thread_cache_size
Added --thread_cache_size=0 to some tests that was depending on not having a thread cache.
-rw-r--r--mysql-test/r/mysqld--help.result2
-rw-r--r--mysql-test/suite/perfschema/t/threads_mysql-master.opt2
-rw-r--r--mysql-test/suite/sys_vars/t/thread_cache_size_func-master.opt1
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 7cac610f88d..a35693eb93e 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1432,7 +1432,7 @@ thread-pool-idle-timeout 60
thread-pool-max-threads 1000
thread-pool-oversubscribe 3
thread-pool-stall-limit 500
-thread-stack 295936
+thread-stack 296960
time-format %H:%i:%s
timed-mutexes FALSE
tmp-table-size 16777216
diff --git a/mysql-test/suite/perfschema/t/threads_mysql-master.opt b/mysql-test/suite/perfschema/t/threads_mysql-master.opt
index f93413a61e5..00efa80d41e 100644
--- a/mysql-test/suite/perfschema/t/threads_mysql-master.opt
+++ b/mysql-test/suite/perfschema/t/threads_mysql-master.opt
@@ -1 +1 @@
---event-scheduler
+--event-scheduler --thread-cache-size=0
diff --git a/mysql-test/suite/sys_vars/t/thread_cache_size_func-master.opt b/mysql-test/suite/sys_vars/t/thread_cache_size_func-master.opt
new file mode 100644
index 00000000000..b8c19e1b5ff
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/thread_cache_size_func-master.opt
@@ -0,0 +1 @@
+--thread-cache-size=0