diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-17 20:47:20 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-17 20:47:20 +0200 |
| commit | 11cbe4271c2f931562bdb5f496dcfa6ebd22760f (patch) | |
| tree | 9189968dca2f68cfe5634ccd7ac1cd1a8a6228d2 /sql/lex.h | |
| parent | 4a66de6dd0f7250dedf28e0c4316cc9d6a9c0ed4 (diff) | |
| parent | 621be521f8ea5680a6c3412ce944819290043117 (diff) | |
| download | mariadb-git-11cbe4271c2f931562bdb5f496dcfa6ebd22760f.tar.gz | |
merge with 3.23.47 (DO statement)
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Docs/manual.texi:
merge
sql/Makefile.am:
merge
sql/mysql_priv.h:
merge
sql/sql_lex.h:
merge
sql/sql_yacc.yy:
merge
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index d72d2ff63a4..59c71f20cd7 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -123,6 +123,7 @@ static SYMBOL symbols[] = { { "DISABLE", SYM(DISABLE_SYM),0,0}, { "DISTINCT", SYM(DISTINCT),0,0}, { "DISTINCTROW", SYM(DISTINCT),0,0}, /* Access likes this */ + { "DO", SYM(DO_SYM),0,0}, { "DOUBLE", SYM(DOUBLE_SYM),0,0}, { "DROP", SYM(DROP),0,0}, { "DUMPFILE", SYM(DUMPFILE),0,0}, @@ -498,9 +499,9 @@ static SYMBOL sql_functions[] = { { "TO_DAYS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_to_days)}, { "TRIM", SYM(TRIM),0,0}, { "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}, { "UNIX_TIMESTAMP", SYM(UNIX_TIMESTAMP),0,0}, + { "UPPER", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ucase)}, { "USER", SYM(USER),0,0}, { "VERSION", SYM(FUNC_ARG0),0,CREATE_FUNC(create_func_version)}, { "WEEK", SYM(WEEK_SYM),0,0}, |