bk commit into 5.0 tree (cmiller:1.2327)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.0 repository of cmiller. When cmiller 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, 2007-01-03 16:31:04-05:00, cmiller@stripped +2 -0
  Review suggestions.

  sql/sql_show.cc@stripped, 2007-01-03 16:31:02-05:00, cmiller@stripped +1 -1
    Revert bad use of macro.

  sql/sql_yacc.yy@stripped, 2007-01-03 16:31:02-05:00, cmiller@stripped +1 -1
    Fix new YACC shift/reduce conflict.  (Now at 249.)

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.0-community--bug24795

--- 1.334/sql/sql_show.cc	2007-01-03 16:31:08 -05:00
+++ 1.335/sql/sql_show.cc	2007-01-03 16:31:08 -05:00
@@ -1330,7 +1330,7 @@ void mysqld_list_processes(THD *thd,cons
         thd_info->command=(int) tmp->command;
         if ((mysys_var= tmp->mysys_var))
           pthread_mutex_lock(&mysys_var->mutex);
-        THD_PROC_INFO(thd_info, (char*) (tmp->killed == THD::KILL_CONNECTION? "Killed"
: 0));
+        thd_info->proc_info= (char*) (tmp->killed == THD::KILL_CONNECTION? "Killed"
: 0);
 #ifndef EMBEDDED_LIBRARY
         thd_info->state_info= (char*) (tmp->locked ? "Locked" :
                                        tmp->net.reading_or_writing ?

--- 1.499/sql/sql_yacc.yy	2007-01-03 16:31:08 -05:00
+++ 1.500/sql/sql_yacc.yy	2007-01-03 16:31:08 -05:00
@@ -6491,7 +6491,7 @@ opt_profile_defs:
 
 profile_defs:
   profile_def
-  | profile_defs ',' profile_defs
+  | profile_defs ',' profile_def
 
 profile_def:
   CPU_SYM