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

.bzrignore

@@ -913,6 +913,7 @@ ndb/src/common/mgmcommon/printConfig/*.d
 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/*.ds?
 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-sslconnect.cpp
 vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
-ndb/src/common/util/testBitmask.cpp

sql/gen_lex_hash.cc

@@ -476,8 +476,10 @@ static inline SYMBOL *get_hash_symbol(const char *s,\n\
   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 @@ static inline SYMBOL *get_hash_symbol(const char *s,\n\
       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\