diff options
| author | unknown <acurtis@xiphis.org> | 2005-12-21 10:26:39 -0800 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-12-21 10:26:39 -0800 |
| commit | 5459c9709e047e3424001504f6cb99265ea650ff (patch) | |
| tree | f13afe1a04c3cdd5a7aa52065913ee888f3eccb2 /sql/sql_lex.h | |
| parent | ec6121fb40519f75e5a6e5b2a77025db6f7b14c9 (diff) | |
| parent | 613dd50a33ac3e64073abdbdae66ce3a93e69e30 (diff) | |
| download | mariadb-git-5459c9709e047e3424001504f6cb99265ea650ff.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.1
into xiphis.org:/home/antony/work3/mysql-5.1-plugable-2
configure.in:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/bdb.test:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/sql_table.cc:
SCCS merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 06a101a1c5c..303245b38bd 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -93,7 +93,7 @@ enum enum_sql_command { SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER, SQLCOM_SHOW_PROC_CODE, SQLCOM_SHOW_FUNC_CODE, SQLCOM_INSTALL_PLUGIN, SQLCOM_UNINSTALL_PLUGIN, - SQLCOM_SHOW_AUTHORS, + SQLCOM_SHOW_AUTHORS, SQLCOM_SHOW_PLUGINS, /* This should be the last !!! */ SQLCOM_END |