Commit 94e140fb authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  zim.(none):/home/brian/mysql/dep-5.1


sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 77dedc31 f454c9d5

mysql-test/r/contributors.result

0 → 100644
+5 −0
Original line number Diff line number Diff line 
SHOW CONTRIBUTORS;

Name	Location	Comment

Ronald Bradford	Brisbane, Australia	EFF contribution for UC2006 Auction

Sheeri Kritzer	Boston, Mass. USA	EFF contribution for UC2006 Auction

Mark Shuttleworth	London, UK.	EFF contribution for UC2006 Auction

mysql-test/t/contributors.test

0 → 100644
+1 −0
Original line number Diff line number Diff line 
SHOW CONTRIBUTORS;

sql/contributors.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/* Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



/* Structure of the name list */



struct show_table_contributors_st {

  const char *name;

  const char *location;

  const char *comment;

};



/*

  Output from "SHOW CONTRIBUTORS"



  Get permission before editing.



  IMPORTANT: Names should be left in historical order.



  Names should be encoded using UTF-8.

*/



struct show_table_contributors_st show_table_contributors[]= {

  {"Ronald Bradford", "Brisbane, Australia", "EFF contribution for UC2006 Auction"},

  {"Sheeri Kritzer", "Boston, Mass. USA", "EFF contribution for UC2006 Auction"},

  {"Mark Shuttleworth", "London, UK.", "EFF contribution for UC2006 Auction"},

  {NULL, NULL, NULL}

};

sql/lex.h

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static SYMBOL symbols[] = { 
  { "CONSTRAINT",	SYM(CONSTRAINT)},

  { "CONTAINS",         SYM(CONTAINS_SYM)},

  { "CONTINUE",         SYM(CONTINUE_SYM)},

  { "CONTRIBUTORS",     SYM(CONTRIBUTORS_SYM)},

  { "CONVERT",		SYM(CONVERT_SYM)},

  { "CREATE",		SYM(CREATE)},

  { "CROSS",		SYM(CROSS)},

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,7 @@ int mysql_find_files(THD *thd,List<char> *files, const char *db, 
                const char *path, const char *wild, bool dir);

bool mysqld_show_storage_engines(THD *thd);

bool mysqld_show_authors(THD *thd);

bool mysqld_show_contributors(THD *thd);

bool mysqld_show_privileges(THD *thd);

bool mysqld_show_column_types(THD *thd);

bool mysqld_help (THD *thd, const char *text);