maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/bzr-new/maria-5.1-build1/

------------------------------------------------------------
revno: 2789
revision-id: psergey@xxxxxxxxxxxx-20091016154458-g89p8v46silum9v7
parent: psergey@xxxxxxxxxxxx-20091015222833-wgpszwg9794t9cgc
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: maria-5.1-build1
timestamp: Fri 2009-10-16 19:44:58 +0400
message:
  MBUG#452116: MariaDB: mysql_install_db causes server segfault
  - Increase thread_stack_size on 64-bit platforms to 240K, so that 
    it can accomodate the HA_CHECK structure which is 130K.
=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2009-09-07 20:50:10 +0000
+++ b/mysys/my_init.c	2009-10-16 15:44:58 +0000
@@ -42,7 +42,8 @@
 
 my_bool my_init_done= 0;
 uint	mysys_usage_id= 0;              /* Incremented for each my_init() */
-ulong   my_thread_stack_size= 65536;
+
+ulong   my_thread_stack_size= (sizeof(void*) <= 4)? 65536: ((256-16)*1024);
 
 static ulong atoi_octal(const char *str)
 {

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-10-15 22:28:33 +0000
+++ b/sql/mysqld.cc	2009-10-16 15:44:58 +0000
@@ -7170,7 +7170,7 @@
   {"thread_stack", OPT_THREAD_STACK,
    "The stack size for each thread.", (uchar**) &my_thread_stack_size,
    (uchar**) &my_thread_stack_size, 0, GET_ULONG, REQUIRED_ARG,DEFAULT_THREAD_STACK,
-   1024L*128L, (longlong) ULONG_MAX, 0, 1024, 0},
+   (sizeof(void*)<=4)?1024L*128L: ((256-16)*1024L), (longlong) ULONG_MAX, 0, 1024, 0},
   { "time_format", OPT_TIME_FORMAT,
     "The TIME format (for future).",
     (uchar**) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],

=== modified file 'support-files/my-innodb-heavy-4G.cnf.sh'
--- a/support-files/my-innodb-heavy-4G.cnf.sh	2009-03-31 14:04:01 +0000
+++ b/support-files/my-innodb-heavy-4G.cnf.sh	2009-10-16 15:44:58 +0000
@@ -174,7 +174,7 @@
 # memory, while if you use your own stack hungry UDF functions or your
 # OS requires more stack for some operations, you might need to set this
 # to a higher value.
-thread_stack = 192K
+thread_stack = 240K
 
 # Set the default transaction isolation level. Levels available are:
 # READ-UNCOMMITTED, READ-COMMITTED, REPEATABLE-READ, SERIALIZABLE

=== modified file 'support-files/my-small.cnf.sh'
--- a/support-files/my-small.cnf.sh	2009-03-31 14:04:01 +0000
+++ b/support-files/my-small.cnf.sh	2009-10-16 15:44:58 +0000
@@ -34,7 +34,7 @@
 read_buffer_size = 256K
 read_rnd_buffer_size = 256K
 net_buffer_length = 2K
-thread_stack = 128K
+thread_stack = 240K
 
 # Don't listen on a TCP/IP port at all. This can be a security enhancement,
 # if all processes that need to connect to mysqld run on the same host.