diff options
| author | unknown <kostja@oak.local> | 2003-09-03 14:12:10 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-09-03 14:12:10 +0400 |
| commit | 5b4fdded744d6d2e69b92470d70bfe38c42478c7 (patch) | |
| tree | 4aa3e74d29fde5abc55c20c2c14e6c286e467c6e /sql/lex.h | |
| parent | ccc46837aaa27c6289732fd4950fec734386a319 (diff) | |
| parent | d2ea1af1a1bb74502e23622dc1e4074a056639db (diff) | |
| download | mariadb-git-5b4fdded744d6d2e69b92470d70bfe38c42478c7.tar.gz | |
merge commit, hope that none of bar and dlenev changes were
lost.
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/mysqld_error.h:
merge commit: new error message added
sql-common/client.c:
merge commit
sql/mysql_priv.h:
merge commit: autoremerge
sql/set_var.h:
merge commit
sql/share/czech/errmsg.txt:
merge commit
sql/share/danish/errmsg.txt:
merge commit
sql/share/dutch/errmsg.txt:
merge commit
sql/share/english/errmsg.txt:
merge commit
sql/share/estonian/errmsg.txt:
merge commit
sql/share/french/errmsg.txt:
merge commit
sql/share/german/errmsg.txt:
merge commit
sql/share/greek/errmsg.txt:
merge commit
sql/share/hungarian/errmsg.txt:
merge commit
sql/share/italian/errmsg.txt:
merge commit
sql/share/japanese/errmsg.txt:
merge commit
sql/share/korean/errmsg.txt:
merge commit
sql/share/norwegian-ny/errmsg.txt:
merge commit
sql/share/norwegian/errmsg.txt:
merge commit
sql/share/polish/errmsg.txt:
merge commit
sql/share/portuguese/errmsg.txt:
merge commit
sql/share/romanian/errmsg.txt:
merge commit
sql/share/russian/errmsg.txt:
merge commit
sql/share/serbian/errmsg.txt:
merge commit
sql/share/slovak/errmsg.txt:
merge commit
sql/share/spanish/errmsg.txt:
merge commit
sql/share/swedish/errmsg.txt:
merge commit
sql/share/ukrainian/errmsg.txt:
merge commit
sql/slave.cc:
merge commit
sql/slave.h:
merge commit
sql/sql_acl.cc:
merge commit
sql/sql_parse.cc:
merge commit
sql/sql_repl.h:
merge commit
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 43a29914e43..5c0d87fa441 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -294,6 +294,7 @@ static SYMBOL symbols[] = { { "NULL", SYM(NULL_SYM),0,0}, { "NUMERIC", SYM(NUMERIC_SYM),0,0}, { "OFFSET", SYM(OFFSET_SYM),0,0}, + { "OLD_PASSWORD", SYM(OLD_PASSWORD),0,0}, { "ON", SYM(ON),0,0}, { "OPEN", SYM(OPEN_SYM),0,0}, { "OPTIMIZE", SYM(OPTIMIZE),0,0}, @@ -596,7 +597,6 @@ static SYMBOL sql_functions[] = { { "NUMPOINTS", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_numpoints)}, { "OCTET_LENGTH", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_length)}, { "OCT", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_oct)}, - { "OLD_PASSWORD", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_old_password)}, { "ORD", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_ord)}, { "OVERLAPS", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_overlaps)}, { "PERIOD_ADD", SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_period_add)}, |