diff options
author | unknown <ingo@mysql.com> | 2004-11-25 21:58:28 +0100 |
---|---|---|
committer | unknown <ingo@mysql.com> | 2004-11-25 21:58:28 +0100 |
commit | fbededc83cdbbbb123537fb8d6a83f0fc3518e1d (patch) | |
tree | b22c4ded45610b4d0609bbf0e4e009eab758ff38 /sql/sql_lex.h | |
parent | e00266defbd798377cc3302a41b4f4a8d118586b (diff) | |
parent | 75e2c2fd998f310ceeebccc81f1de9e5daf3155d (diff) | |
download | mariadb-git-fbededc83cdbbbb123537fb8d6a83f0fc3518e1d.tar.gz |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index ce39a846fda..fef78a363fe 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -78,7 +78,8 @@ enum enum_sql_command { SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_SHOW_NEW_MASTER, SQLCOM_DO, SQLCOM_SHOW_WARNS, SQLCOM_EMPTY_QUERY, SQLCOM_SHOW_ERRORS, SQLCOM_SHOW_COLUMN_TYPES, SQLCOM_SHOW_STORAGE_ENGINES, SQLCOM_SHOW_PRIVILEGES, - SQLCOM_HELP, SQLCOM_DROP_USER, SQLCOM_REVOKE_ALL, SQLCOM_CHECKSUM, + SQLCOM_HELP, SQLCOM_CREATE_USER, SQLCOM_DROP_USER, SQLCOM_RENAME_USER, + SQLCOM_REVOKE_ALL, SQLCOM_CHECKSUM, SQLCOM_CREATE_PROCEDURE, SQLCOM_CREATE_SPFUNCTION, SQLCOM_CALL, SQLCOM_DROP_PROCEDURE, SQLCOM_ALTER_PROCEDURE,SQLCOM_ALTER_FUNCTION, SQLCOM_SHOW_CREATE_PROC, SQLCOM_SHOW_CREATE_FUNC, |