diff options
| author | kostja@oak.local <> | 2003-07-09 18:24:43 +0400 |
|---|---|---|
| committer | kostja@oak.local <> | 2003-07-09 18:24:43 +0400 |
| commit | 941a8623cafac7904e07a50793b41f4131586a5d (patch) | |
| tree | 9774a7006312380fb4dbc92767fe0c009a485b12 /sql/lex.h | |
| parent | 39e7db9f51fb9f78d7c3846ad11afd1f13778593 (diff) | |
| parent | 0f28677af605bafbb0bcc431a9d467f1d1457d72 (diff) | |
| download | mariadb-git-941a8623cafac7904e07a50793b41f4131586a5d.tar.gz | |
resolved conflict with pulled changeset
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 a148baad07f..d177a17eae8 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -288,6 +288,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}, @@ -586,7 +587,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)}, |