bk commit into 5.0 tree (cmiller:1.2254)

[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, 2006-08-23 18:37:04-04:00, cmiller@stripped +2 -0
  Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca
  into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint
  MERGE: 1.2216.27.2

  BitKeeper/etc/ignore@stripped, 2006-08-23 18:36:59-04:00, cmiller@stripped +2 -2
    auto-union
    MERGE: 1.227.1.1

  sql/gen_lex_hash.cc@stripped, 2006-08-23 18:37:01-04:00, cmiller@stripped +4 -6
    Auto merged
    MERGE: 1.66.1.2

# 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/merge/mysql-5.0-maint/RESYNC

--- 1.68/sql/gen_lex_hash.cc	2006-08-23 18:37:08 -04:00
+++ 1.69/sql/gen_lex_hash.cc	2006-08-23 18:37:08 -04:00
@@ -476,8 +476,10 @@
   if (len == 0) {\n\
     DBUG_PRINT(\"warning\", (\"get_hash_symbol() received a request for a zero-length symbol, which is probably a mistake.\"));\
     return(NULL);\n\
-  }\
-\n\
+  }\n"
+);
+
+  printf("\
   if (function){\n\
     if (len>sql_functions_max_len) return 0;\n\
     hash_map= sql_functions_map;\n\
@@ -508,7 +510,10 @@
       cur_struct= uint4korr(hash_map+\n\
                         (((uint16)cur_struct + cur_char - first_char)*4));\n\
       cur_str++;\n\
-    }\n\
+    }\n"
+);
+
+  printf("\
   }else{\n\
     if (len>symbols_max_len) return 0;\n\
     hash_map= symbols_map;\n\

--- 1.228/BitKeeper/etc/ignore	2006-08-23 18:37:08 -04:00
+++ 1.229/BitKeeper/etc/ignore	2006-08-23 18:37:08 -04:00
@@ -913,6 +913,7 @@
 ndb/src/common/portlib/libportlib.dsp
 ndb/src/common/transporter/libtransporter.dsp
 ndb/src/common/util/libgeneral.dsp
+ndb/src/common/util/testBitmask.cpp
 ndb/src/cw/cpcd/ndb_cpcd
 ndb/src/dummy.cpp
 ndb/src/kernel/blocks/backup/libbackup.dsp
@@ -1138,6 +1139,7 @@
 sql/*.vcproj
 sql/.gdbinit
 sql/client.c
+sql/f.c
 sql/gen_lex_hash
 sql/gmon.out
 sql/lex_hash.h
@@ -1296,4 +1298,3 @@
 vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
-ndb/src/common/util/testBitmask.cpp