diff options
author | unknown <brian@zim.(none)> | 2006-05-23 11:25:11 -0700 |
---|---|---|
committer | unknown <brian@zim.(none)> | 2006-05-23 11:25:11 -0700 |
commit | 821daed6619869badb5b23e17248de7ef3273763 (patch) | |
tree | ad6d1a53dee5dc9e2068ba52ba8c3f2d3b493358 /sql/sql_parse.cc | |
parent | 2b8527e94507acd10ff48fee4fe1b8814d246dea (diff) | |
parent | 4afca4061ca7bfc8fe2f7cb18cee0476ed8192fc (diff) | |
download | mariadb-git-821daed6619869badb5b23e17248de7ef3273763.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 af6ac7d862a..95f3f455351 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3531,6 +3531,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; |