bk commit into 5.0 tree (pem:1.2002)

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.2002 05/11/24 19:13:13 pem@stripped +3 -0
  Some post-merge cleaning, and made assert THD::store_globals() work at all times.

  sql/sql_class.cc
    1.224 05/11/24 19:13:06 pem@stripped +1 -0
    Init THD::tread_stack in constructor.

  sql/mysqld.cc
    1.520 05/11/24 19:13:06 pem@stripped +4 -1
    Make sure we have thd->thread_stack set before calling store_globals().
    (And fixed compiler warning.)

  mysql-test/t/sp.test
    1.168 05/11/24 19:13:06 pem@stripped +2 -0
    Tidying up after merge.

# 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:	pem
# Host:	mysql.comhem.se
# Root:	/usr/home/pem/bug13729/mysql-5.0

--- 1.519/sql/mysqld.cc	2005-11-23 00:12:34 +01:00
+++ 1.520/sql/mysqld.cc	2005-11-24 19:13:06 +01:00
@@ -1589,6 +1589,7 @@
       wake_thread--;
       thd=thread_cache.get();
       thd->real_id=pthread_self();
+      thd->thread_stack= (char *) &thd;
       (void) thd->store_globals();
       thd->thr_create_time= time(NULL);
       threads.append(thd);
@@ -6912,8 +6913,10 @@
   case OPT_MYISAM_STATS_METHOD:
   {
     ulong method_conv;
-    myisam_stats_method_str= argument;
     int method;
+    LINT_INIT(method_conv);
+
+    myisam_stats_method_str= argument;
     if ((method=find_type(argument, &myisam_stats_method_typelib, 2)) <= 0)
     {
       fprintf(stderr, "Invalid value of myisam_stats_method: %s.\n", argument);

--- 1.223/sql/sql_class.cc	2005-11-23 19:20:23 +01:00
+++ 1.224/sql/sql_class.cc	2005-11-24 19:13:06 +01:00
@@ -183,6 +183,7 @@
    spcont(NULL)
 {
   stmt_arena= this;
+  thread_stack= 0;
   db= 0;
   catalog= (char*)"std"; // the only catalog we have for now
   main_security_ctx.init();

--- 1.167/mysql-test/t/sp.test	2005-11-24 12:12:43 +01:00
+++ 1.168/mysql-test/t/sp.test	2005-11-24 19:13:06 +01:00
@@ -4773,6 +4773,8 @@
 drop procedure bug10100pd|
 drop procedure bug10100pc|
 drop view v1|
+
+#
 # BUG#13729: Stored procedures: packet error after exception handled
 #
 --disable_warnings