bk commit into 5.0 tree (holyfoot:1.1942)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf 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.1942 05/05/07 19:22:31 holyfoot@hf-ibm.(none) +1 -0
  Fix for embedded server to compile

  sql/sql_show.cc
    1.243 05/05/07 19:22:26 holyfoot@stripped +3 -3
    operations with grant_tables should be #ifdef-ed

# 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:	holyfoot
# Host:	hf-ibm.(none)
# Root:	/home/hf/work/mysql-5.0.clean

--- 1.242/sql/sql_show.cc	Sat May  7 20:14:28 2005
+++ 1.243/sql/sql_show.cc	Sat May  7 19:22:26 2005
@@ -2317,9 +2317,6 @@
           end=strmov(end,grant_types.type_names[bitnr]);
         }
       }
-#else
-      *end= 0;
-#endif
       if (tables->schema_table)      // any user has 'select' privilege on all 
                                      // I_S table columns
         table->field[17]->store(grant_types.type_names[0],
@@ -2327,6 +2324,9 @@
       else
         table->field[17]->store(tmp+1,end == tmp ? 0 : (uint) (end-tmp-1), cs);
 
+#else
+      *end= 0;
+#endif
       table->field[1]->store(base_name, strlen(base_name), cs);
       table->field[2]->store(file_name, strlen(file_name), cs);
       table->field[3]->store(field->field_name, strlen(field->field_name),