bk commit into 5.2 tree (patg:1.2337)

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.2 repository of patg. When patg 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@stripped, 2006-11-10 10:53:16-05:00, patg@stripped +1 -0
  Merge pgalbraith@stripped:/home/bk/mysql-5.2
  into  govinda.patg.net:/home/patg/mysql-build/mysql-5.2-wl3031.clone2
  MERGE: 1.2332.1.1

  sql/sql_parse.cc@stripped, 2006-11-10 10:53:13-05:00, patg@stripped +0 -0
    Auto merged
    MERGE: 1.515.1.63

# 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:	patg
# Host:	govinda.patg.net
# Root:	/home/patg/mysql-build/mysql-5.2-wl3031.clone2/RESYNC

--- 1.520/sql/sql_parse.cc	2006-11-10 10:53:22 -05:00
+++ 1.521/sql/sql_parse.cc	2006-11-10 10:53:22 -05:00
@@ -1105,7 +1105,7 @@
   Vio* save_vio;
   ulong save_client_capabilities;
 
-  thd->proc_info= "Execution of init_command";
+  THD_SET_PROC_INFO(thd, "Execution of init_command");
   /*
     We need to lock init_command_var because
     during execution of init_command_var query
@@ -1205,7 +1205,7 @@
       net->compress=1;				// Use compression
 
     thd->version= refresh_version;
-    thd->proc_info= 0;
+    THD_SET_PROC_INFO(thd, 0);
     thd->command= COM_SLEEP;
     thd->set_time();
     thd->init_for_queries();
@@ -1215,7 +1215,7 @@
       execute_init_command(thd, &sys_init_connect, &LOCK_sys_init_connect);
       if (thd->query_error)
 	thd->killed= THD::KILL_CONNECTION;
-      thd->proc_info=0;
+      THD_SET_PROC_INFO(thd, 0);
       thd->set_time();
       thd->init_for_queries();
     }
@@ -1298,7 +1298,7 @@
   if (thd->variables.max_join_size == HA_POS_ERROR)
     thd->options |= OPTION_BIG_SELECTS;
 
-  thd->proc_info=0;
+  THD_SET_PROC_INFO(thd, 0);
   thd->version=refresh_version;
   thd->security_ctx->priv_user=
     thd->security_ctx->user= (char*) my_strdup("boot", MYF(MY_WME));
@@ -2158,7 +2158,7 @@
   if (thd->lock || thd->open_tables || thd->derived_tables ||
       thd->prelocked_mode)
   {
-    thd->proc_info="closing tables";
+    THD_SET_PROC_INFO(thd, "closing tables");
     close_thread_tables(thd);			/* Free tables */
   }
   /*
@@ -2181,9 +2181,9 @@
 
   log_slow_statement(thd);
 
-  thd->proc_info="cleaning up";
+  THD_SET_PROC_INFO(thd, "cleaning up");
   VOID(pthread_mutex_lock(&LOCK_thread_count)); // For process list
-  thd->proc_info=0;
+  THD_SET_PROC_INFO(thd, 0);
   thd->command=COM_SLEEP;
   thd->query=0;
   thd->query_length=0;
@@ -2217,7 +2217,7 @@
   */
   if (thd->enable_slow_log && !thd->user_time)
   {
-    thd->proc_info="logging slow query";
+    THD_SET_PROC_INFO(thd, "logging slow query");
 
     if ((ulong) (thd->start_time - thd->time_after_lock) >
 	thd->variables.long_query_time ||
@@ -3528,7 +3528,7 @@
     if (add_item_to_list(thd, new Item_null()))
       goto error;
 
-    thd->proc_info="init";
+    THD_SET_PROC_INFO(thd, "init");
     if ((res= open_and_lock_tables(thd, all_tables)))
       break;
 
@@ -5213,7 +5213,7 @@
   }
 
 end:
-  thd->proc_info="query end";
+  THD_SET_PROC_INFO(thd, "query end");
 
   /*
     Binlog-related cleanup:
@@ -6132,7 +6132,7 @@
 	lex->sphead= NULL;
       }
     }
-    thd->proc_info="freeing items";
+    THD_SET_PROC_INFO(thd, "freeing items");
     thd->end_statement();
     thd->cleanup_after_query();
     DBUG_ASSERT(thd->change_list.is_empty());