bk commit into 5.1 tree (ramil:1.2486) BUG#23810

[ramil]

Below is the list of changes that have just been committed into a local
5.1 repository of ram. When ram 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-05-14 09:39:54+05:00, ramil@stripped +1 -0
  Fix for bug #23810: Server crashes on various "show status ..." commands
    
  We access some variable values using casts like *(long *) buff
  that may cause crashes on some platforms (e.g. solaris 64) if buff is
  not properly aligned.
  Fix: align the buffer used.

  sql/sql_show.cc@stripped, 2007-05-14 09:39:52+05:00, ramil@stripped +2 -2
    Fix for bug #23810: Server crashes on various "show status ..." commands
      
    We access some variable values using casts like *(long *) buff
    that may cause crashes on some platforms (e.g. solaris 64) if buff is
    not properly aligned.
    Fix: align the buffer used.

# 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:	ramil
# Host:	ramil.myoffice.izhnet.ru
# Root:	/home/ram/work/b23810/b23810.5.1

--- 1.408/sql/sql_show.cc	2007-05-14 09:39:59 +05:00
+++ 1.409/sql/sql_show.cc	2007-05-14 09:39:59 +05:00
@@ -2022,7 +2022,7 @@ static bool show_status_array(THD *thd, 
                               const char *prefix, TABLE *table,
                               bool ucase_names)
 {
-  char buff[SHOW_VAR_FUNC_BUFF_SIZE], *prefix_end;
+  char buff[ALIGN_SIZE(SHOW_VAR_FUNC_BUFF_SIZE)], *prefix_end;
   /* the variable name should not be longer than 64 characters */
   char name_buffer[64];
   int len;
@@ -5216,7 +5216,7 @@ int fill_schema_status(THD *thd, SHOW_VA
   SHOW_VAR tmp, *var;
   SHOW_TYPE show_type;
   LEX_STRING null_lex_str;
-  char buff[SHOW_VAR_FUNC_BUFF_SIZE];
+  char buff[ALIGN_SIZE(SHOW_VAR_FUNC_BUFF_SIZE)];
   char name_buf[64], *name_pos;
   int name_len;
   DBUG_ENTER("fill_schema_status");