diff options
| author | unknown <serg@serg.mylan> | 2003-09-03 15:40:19 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-09-03 15:40:19 +0200 |
| commit | 1ef5dce8a7d406abed6c936d5ee5bc5ee286c254 (patch) | |
| tree | 71dcc697f8ec99ed97c7b072acebd3a02287c524 /sql/lex.h | |
| parent | cf578b265a0ec93333d58c850f695916d36155cb (diff) | |
| parent | b74332ec6bd0882a5f328236fdc2a52b395ae2f1 (diff) | |
| download | mariadb-git-1ef5dce8a7d406abed6c936d5ee5bc5ee286c254.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
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/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.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, 1 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index 686ec6f8c1d..aa6d96d4029 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}, @@ -594,7 +595,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)}, |