diff options
| author | unknown <monty@narttu.mysql.fi> | 2000-11-16 00:24:11 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2000-11-16 00:24:11 +0200 |
| commit | c7d2c59ceb4e3548eb74e5d8fba16e0f41ffc7d9 (patch) | |
| tree | 31119bae32d48d3c415144eb5aed588455eefa1a /sql/lex.h | |
| parent | dcf4e49369d91b78ab73b9de038d2729afb3a2a6 (diff) | |
| parent | 9a846a52ae62f701c2d54d3f468e2ead393acf91 (diff) | |
| download | mariadb-git-c7d2c59ceb4e3548eb74e5d8fba16e0f41ffc7d9.tar.gz | |
merge
configure.in:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.h:
Auto merged
BitKeeper/etc/logging_ok:
Auto merged
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index a75fa07c3b7..503ce6998bb 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -302,6 +302,7 @@ static SYMBOL symbols[] = { { "TINYTEXT", SYM(TINYTEXT),0,0}, { "TINYINT", SYM(TINYINT),0,0}, { "TRAILING", SYM(TRAILING),0,0}, + { "TRUNCATE", SYM(TRUNCATE_SYM),0,0}, { "TO", SYM(TO_SYM),0,0}, { "TYPE", SYM(TYPE_SYM),0,0}, { "UNION", SYM(UNION_SYM),0,0}, @@ -443,7 +444,6 @@ static SYMBOL sql_functions[] = { { "TIME_TO_SEC", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_time_to_sec)}, { "TO_DAYS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_to_days)}, { "TRIM", SYM(TRIM),0,0}, - { "TRUNCATE", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_truncate )}, { "UCASE", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)}, { "UPPER", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)}, { "UNIQUE_USERS", SYM(UNIQUE_USERS),0,0}, |