bk commit into 5.0 tree (monty:1.1999)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1999 05/12/03 18:13:06 monty@stripped +4 -0
  Set thread_stack after return from end_thread()
  Fixes core dump when reusing thread when running debug binary

  sql/sql_parse.cc
    1.521 05/12/03 18:13:02 monty@stripped +1 -0
    Set thread_stack after return from end_thread()

  sql/mysqld.cc
    1.520 05/12/03 18:13:02 monty@stripped +1 -0
    Set thread_stack (to avoid core dump in store_globlas)

  sql-bench/server-cfg.sh
    1.51 05/12/03 18:13:02 monty@stripped +5 -5
    Use ENGINE= instead of TYPE=

  sql-bench/bench-init.pl.sh
    1.29 05/12/03 18:13:02 monty@stripped +1 -1
    Use ENGINE= instead of TYPE=

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.0

--- 1.28/sql-bench/bench-init.pl.sh	2003-11-24 18:05:21 +02:00
+++ 1.29/sql-bench/bench-init.pl.sh	2005-12-03 18:13:02 +02:00
@@ -447,7 +447,7 @@
 --create-options=#
   Extra argument to all create statements.  If you for example want to
   create all MySQL tables as BDB tables use:
-  --create-options=TYPE=BDB
+  --create-options=ENGINE=BDB
 
 --database (Default $opt_database)
   In which database the test tables are created.

--- 1.50/sql-bench/server-cfg.sh	2004-08-16 14:06:30 +03:00
+++ 1.51/sql-bench/server-cfg.sh	2005-12-03 18:13:02 +02:00
@@ -174,29 +174,29 @@
 
   # Some fixes that depends on the environment
   if (defined($main::opt_create_options) &&
-      $main::opt_create_options =~ /type=heap/i)
+      $main::opt_create_options =~ /engine=heap/i)
   {
     $limits{'working_blobs'}	= 0; # HEAP tables can't handle BLOB's
   }
   if (defined($main::opt_create_options) &&
-      $main::opt_create_options =~ /type=innodb/i)
+      $main::opt_create_options =~ /engine=innodb/i)
   {
     $self->{'transactions'}	= 1;	# Transactions enabled
   }
   if (defined($main::opt_create_options) &&
-      $main::opt_create_options =~ /type=ndb/i)
+      $main::opt_create_options =~ /engine=ndb/i)
   {
     $self->{'transactions'}	= 1;	# Transactions enabled
     $limits{'max_columns'}	= 90;	# Max number of columns in table
     $limits{'max_tables'}	= 32;   # No comments
   }
   if (defined($main::opt_create_options) &&
-      $main::opt_create_options =~ /type=bdb/i)
+      $main::opt_create_options =~ /engine=bdb/i)
   {
     $self->{'transactions'}	= 1;	# Transactions enabled
   }
   if (defined($main::opt_create_options) &&
-      $main::opt_create_options =~ /type=gemini/i)
+      $main::opt_create_options =~ /engine=gemini/i)
   {
     $limits{'working_blobs'}	= 0; # Blobs not implemented yet
     $limits{'max_tables'}	= 500;

--- 1.519/sql/mysqld.cc	2005-11-23 01:12:34 +02:00
+++ 1.520/sql/mysqld.cc	2005-12-03 18:13:02 +02:00
@@ -1589,6 +1589,7 @@
       wake_thread--;
       thd=thread_cache.get();
       thd->real_id=pthread_self();
+      thd->thread_stack= (char*) &thd;          // For store_globals
       (void) thd->store_globals();
       thd->thr_create_time= time(NULL);
       threads.append(thd);

--- 1.520/sql/sql_parse.cc	2005-11-24 02:36:25 +02:00
+++ 1.521/sql/sql_parse.cc	2005-12-03 18:13:02 +02:00
@@ -1182,6 +1182,7 @@
       or this thread has been schedule to handle the next query
     */
     thd= current_thd;
+    thd->thread_stack= (char*) &thd;
   } while (!(test_flags & TEST_NO_THREADS));
   /* The following is only executed if we are not using --one-thread */
   return(0);					/* purecov: deadcode */