Browse Source

stack too small on labrador (again!)

increase the thread stack a bit for main.signal_demo3
and sys_vars.max_sp_recursion_depth_func to stop failing
pull/154/head
Sergei Golubchik 10 years ago
parent
commit
d5b1b1ac60
  1. 2
      include/my_pthread.h
  2. 2
      mysql-test/r/mysqld--help,win.rdiff
  3. 2
      mysql-test/r/mysqld--help.result
  4. 4
      mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
  5. 4
      mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
  6. 10
      mysql-test/suite/sys_vars/r/thread_stack_basic.result

2
include/my_pthread.h

@ -714,7 +714,7 @@ extern void my_mutex_end(void);
We need to have at least 256K stack to handle calls to myisamchk_init()
with the current number of keys and key parts.
*/
#define DEFAULT_THREAD_STACK (288*1024L)
#define DEFAULT_THREAD_STACK (289*1024L)
#endif
#define MY_PTHREAD_LOCK_READ 0

2
mysql-test/r/mysqld--help,win.rdiff

@ -133,6 +133,6 @@
-thread-pool-oversubscribe 3
-thread-pool-stall-limit 500
+thread-pool-min-threads 1
thread-stack 294912
thread-stack 295936
time-format %H:%i:%s
timed-mutexes FALSE

2
mysql-test/r/mysqld--help.result

@ -1430,7 +1430,7 @@ thread-pool-idle-timeout 60
thread-pool-max-threads 1000
thread-pool-oversubscribe 3
thread-pool-stall-limit 500
thread-stack 294912
thread-stack 295936
time-format %H:%i:%s
timed-mutexes FALSE
tmp-table-size 16777216

4
mysql-test/suite/sys_vars/r/sysvars_server_embedded.result

@ -3861,9 +3861,9 @@ READ_ONLY YES
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME THREAD_STACK
SESSION_VALUE NULL
GLOBAL_VALUE 294912
GLOBAL_VALUE 295936
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 294912
DEFAULT_VALUE 295936
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The stack size for each thread

4
mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result

@ -4631,9 +4631,9 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME THREAD_STACK
SESSION_VALUE NULL
GLOBAL_VALUE 294912
GLOBAL_VALUE 295936
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE 294912
DEFAULT_VALUE 295936
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The stack size for each thread

10
mysql-test/suite/sys_vars/r/thread_stack_basic.result

@ -1,20 +1,20 @@
select @@global.thread_stack;
@@global.thread_stack
294912
295936
select @@session.thread_stack;
ERROR HY000: Variable 'thread_stack' is a GLOBAL variable
show global variables like 'thread_stack';
Variable_name Value
thread_stack 294912
thread_stack 295936
show session variables like 'thread_stack';
Variable_name Value
thread_stack 294912
thread_stack 295936
select * from information_schema.global_variables where variable_name='thread_stack';
VARIABLE_NAME VARIABLE_VALUE
THREAD_STACK 294912
THREAD_STACK 295936
select * from information_schema.session_variables where variable_name='thread_stack';
VARIABLE_NAME VARIABLE_VALUE
THREAD_STACK 294912
THREAD_STACK 295936
set global thread_stack=1;
ERROR HY000: Variable 'thread_stack' is a read only variable
set session thread_stack=1;

Loading…
Cancel
Save