summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore3
-rw-r--r--sql/gen_lex_hash.cc11
2 files changed, 10 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore
index 5e6c7509354..84713371ce8 100644
--- a/.bzrignore
+++ b/.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
diff --git a/sql/gen_lex_hash.cc b/sql/gen_lex_hash.cc
index b110120bdf5..5a8bd48d699 100644
--- a/sql/gen_lex_hash.cc
+++ b/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\