diff options
author | unknown <brian@zim.(none)> | 2006-05-08 15:34:55 -0700 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2006-05-08 15:34:55 -0700 |
commit | 3aa2d18ca08e48c320b5583ac188ffc460d76719 (patch) | |
tree | 770564984102a7b9bec653eb374e7d14febc7a50 /sql/sql_parse.cc | |
parent | 484e89dfb61f8996e9d943415ad3b5c2ed449176 (diff) | |
parent | 12ede0e0be7cf6b391b487d41b0e3aa4a4cc3563 (diff) | |
download | mariadb-git-3aa2d18ca08e48c320b5583ac188ffc460d76719.tar.gz |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/dep-5.1
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8ee78578631..d7338c81bd0 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3527,6 +3527,9 @@ end_with_restore_list: case SQLCOM_SHOW_AUTHORS: res= mysqld_show_authors(thd); break; + case SQLCOM_SHOW_CONTRIBUTORS: + res= mysqld_show_contributors(thd); + break; case SQLCOM_SHOW_PRIVILEGES: res= mysqld_show_privileges(thd); break; |