diff options
| author | unknown <igor@rurik.mysql.com> | 2005-11-22 23:00:57 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-11-22 23:00:57 -0800 |
| commit | c3c232a88cc911ccd6b59b80ec93cc8b3de51001 (patch) | |
| tree | f8ae80abeb1f01b0ecf98787da39162a6013417a /sql/sql_lex.h | |
| parent | 806482c7e45aceac81fe3999197d3a3724653c03 (diff) | |
| parent | 4aea839bde48c615d2d672ebbd29f20c297fe670 (diff) | |
| download | mariadb-git-c3c232a88cc911ccd6b59b80ec93cc8b3de51001.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 11618199e69..4295cac9e7b 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -90,6 +90,7 @@ enum enum_sql_command { SQLCOM_CREATE_TRIGGER, SQLCOM_DROP_TRIGGER, SQLCOM_XA_START, SQLCOM_XA_END, SQLCOM_XA_PREPARE, SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER, + SQLCOM_SHOW_PROC_CODE, SQLCOM_SHOW_FUNC_CODE, /* This should be the last !!! */ SQLCOM_END |