Commit 1f49670a authored by unknown's avatar unknown

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


BitKeeper/etc/ignore:
  auto-union
sql/gen_lex_hash.cc:
  Auto merged
parents df4cbda0 336250e6
No related merge requests found
...@@ -913,6 +913,7 @@ ndb/src/common/mgmcommon/printConfig/*.d ...@@ -913,6 +913,7 @@ ndb/src/common/mgmcommon/printConfig/*.d
ndb/src/common/portlib/libportlib.dsp ndb/src/common/portlib/libportlib.dsp
ndb/src/common/transporter/libtransporter.dsp ndb/src/common/transporter/libtransporter.dsp
ndb/src/common/util/libgeneral.dsp ndb/src/common/util/libgeneral.dsp
ndb/src/common/util/testBitmask.cpp
ndb/src/cw/cpcd/ndb_cpcd ndb/src/cw/cpcd/ndb_cpcd
ndb/src/dummy.cpp ndb/src/dummy.cpp
ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/backup/libbackup.dsp
...@@ -1138,6 +1139,7 @@ sql/*.ds? ...@@ -1138,6 +1139,7 @@ sql/*.ds?
sql/*.vcproj sql/*.vcproj
sql/.gdbinit sql/.gdbinit
sql/client.c sql/client.c
sql/f.c
sql/gen_lex_hash sql/gen_lex_hash
sql/gmon.out sql/gmon.out
sql/lex_hash.h sql/lex_hash.h
...@@ -1296,4 +1298,3 @@ vio/viotest-sslconnect.cpp ...@@ -1296,4 +1298,3 @@ vio/viotest-sslconnect.cpp
vio/viotest.cpp vio/viotest.cpp
zlib/*.ds? zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj
ndb/src/common/util/testBitmask.cpp
...@@ -476,8 +476,10 @@ static inline SYMBOL *get_hash_symbol(const char *s,\n\ ...@@ -476,8 +476,10 @@ static inline SYMBOL *get_hash_symbol(const char *s,\n\
if (len == 0) {\n\ if (len == 0) {\n\
DBUG_PRINT(\"warning\", (\"get_hash_symbol() received a request for a zero-length symbol, which is probably a mistake.\"));\ DBUG_PRINT(\"warning\", (\"get_hash_symbol() received a request for a zero-length symbol, which is probably a mistake.\"));\
return(NULL);\n\ return(NULL);\n\
}\ }\n"
\n\ );
printf("\
if (function){\n\ if (function){\n\
if (len>sql_functions_max_len) return 0;\n\ if (len>sql_functions_max_len) return 0;\n\
hash_map= sql_functions_map;\n\ hash_map= sql_functions_map;\n\
...@@ -508,7 +510,10 @@ static inline SYMBOL *get_hash_symbol(const char *s,\n\ ...@@ -508,7 +510,10 @@ static inline SYMBOL *get_hash_symbol(const char *s,\n\
cur_struct= uint4korr(hash_map+\n\ cur_struct= uint4korr(hash_map+\n\
(((uint16)cur_struct + cur_char - first_char)*4));\n\ (((uint16)cur_struct + cur_char - first_char)*4));\n\
cur_str++;\n\ cur_str++;\n\
}\n\ }\n"
);
printf("\
}else{\n\ }else{\n\
if (len>symbols_max_len) return 0;\n\ if (len>symbols_max_len) return 0;\n\
hash_map= symbols_map;\n\ hash_map= symbols_map;\n\
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment