bk commit into 5.1 tree (cmiller:1.2272)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 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, 2006-08-23 19:27:32+02:00, cmiller@stripped +4 -0
  Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908
  into  maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908
  MERGE: 1.1810.1935.1

  mysql-test/r/variables.result@stripped, 2006-08-23 19:21:52+02:00, cmiller@stripped
+0 -6
    Auto merged
    MERGE: 1.76.7.1

  mysql-test/t/variables.test@stripped, 2006-08-23 19:21:52+02:00, cmiller@stripped +0
-11
    Auto merged
    MERGE: 1.51.6.1

  sql/gen_lex_hash.cc@stripped, 2006-08-23 19:27:29+02:00, cmiller@stripped +0 -8
    Manual merge.
    MERGE: 1.66.1.1

  sql/sql_lex.cc@stripped, 2006-08-23 19:21:52+02:00, cmiller@stripped +0 -2
    Auto merged
    MERGE: 1.142.18.1

# 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:	maint1.mysql.com
# Root:	/data/localhome/cmiller/bug20908/my51-bug20908/RESYNC

--- 1.67/sql/gen_lex_hash.cc	2006-08-23 19:28:38 +02:00
+++ 1.68/sql/gen_lex_hash.cc	2006-08-23 19:28:38 +02:00
@@ -450,6 +450,7 @@ int main(int argc,char **argv)
    and you are welcome to modify and redistribute it under the GPL license\n\
    \n*/\n\n");
 
+  /* Broken up to indicate that it's not advice to you, gentle reader. */
   printf("/* Do " "not " "edit " "this " "file!  This is generated by "
          "gen_lex_hash.cc\nthat seeks for a perfect hash function */\n\n");
   printf("#include \"lex.h\"\n\n");