diff options
| author | unknown <serg@serg.mylan> | 2003-09-03 12:07:18 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-09-03 12:07:18 +0200 |
| commit | cf578b265a0ec93333d58c850f695916d36155cb (patch) | |
| tree | 84310e757264951823af695be9ae599473f79f1b /sql/lex.h | |
| parent | 93c9f9c69ff12d765b4c119c3eee240db97cbea7 (diff) | |
| parent | 4a21b30e47cfb2905ac1e6a3e9a220164067b595 (diff) | |
| download | mariadb-git-cf578b265a0ec93333d58c850f695916d36155cb.tar.gz | |
merged
include/my_sys.h:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h index 43a29914e43..686ec6f8c1d 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -479,9 +479,7 @@ static SYMBOL sql_functions[] = { { "COUNT", SYM(COUNT_SYM),0,0}, { "COS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_cos)}, { "COT", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_cot)}, -#ifdef HAVE_COMPRESS { "CRC32", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_crc32)}, -#endif { "CROSSES", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_crosses)}, { "CURDATE", SYM(CURDATE),0,0}, { "CURTIME", SYM(CURTIME),0,0}, |