diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-23 18:29:44 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-23 18:29:44 -0400 |
| commit | f98d253d70980c8093049624e5fe49921501d743 (patch) | |
| tree | 82ca29898b5782c8eeba5c39f97741b2e3d4beb1 | |
| parent | d4e12210ad082f6c2f84325978cb911a04fec8b5 (diff) | |
| parent | 336250e60d57c9eba11ce141f3dc02f5e916ec50 (diff) | |
| download | mariadb-git-f98d253d70980c8093049624e5fe49921501d743.tar.gz | |
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.1-new-maint
BitKeeper/etc/ignore:
auto-union
sql/gen_lex_hash.cc:
Auto merged
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | sql/gen_lex_hash.cc | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 1cf0cf7b889..095c8bb7390 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1170,6 +1170,7 @@ sql/*.ds? sql/*.vcproj sql/.gdbinit sql/client.c +sql/f.c sql/gen_lex_hash sql/gmon.out sql/handlerton.cc 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\ |