Commit 9e09c602 authored by unknown's avatar unknown
Browse files

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

into grrr.local:/Users/brian/mysql/mysql-5.1-new
parents 6a8eb801 c1595446

mysql-test/r/show_check.result

+4 −0
Original line number Diff line number Diff line
@@ -564,3 +564,7 @@ DROP TABLE tyt2; 
DROP TABLE urkunde;

SHOW TABLES FROM non_existing_database;

ERROR 42000: Unknown database 'non_existing_database'

SHOW AUTHORS;

Name	Location	Comment

Brian "Krow" Aker	Seattle, WA. USA	Architecture, archive, federated, buncha of little stuff :)

David Axmark	Uppsala, Sweden	Small stuff long time ago, Monty ripped it out!

mysql-test/t/show_check.test

+4 −0
Original line number Diff line number Diff line
@@ -424,3 +424,7 @@ DROP TABLE urkunde; 
#

--error 1049

SHOW TABLES FROM non_existing_database;



# End of 4.1 tests

#

SHOW AUTHORS;

sql/authors.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/***************************************************************************

** Output from "SHOW AUTHORS"

** If you can update it, you get to be in it :)

** Dont be offended if your name is not in here, just add it!

***************************************************************************/



struct show_table_authors_st {

  const char *name;

  const char *location;

  const char *comment;

};



struct show_table_authors_st show_table_authors[]= {

  { "Brian \"Krow\" Aker", "Seattle, WA. USA", 

    "Architecture, archive, federated, buncha of little stuff :)" },

  { "David Axmark", "Uppsala, Sweden", "Small stuff long time ago, Monty ripped it out!"},

  {NULL, NULL, NULL}

};

sql/field.h

+2 −2
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ class Field_varstring :public Field_longstr { 
  int cmp_max(const char *, const char *, uint max_length);

  int cmp(const char *a,const char*b)

  {

    return cmp_max(a, b, ~0);

    return cmp_max(a, b, ~0L);

  }

  void sort_string(char *buff,uint length);

  void get_key_image(char *buff,uint length, imagetype type);
@@ -1141,7 +1141,7 @@ class Field_blob :public Field_longstr { 
  my_decimal *val_decimal(my_decimal *);

  int cmp_max(const char *, const char *, uint max_length);

  int cmp(const char *a,const char*b)

    { return cmp_max(a, b, ~0); }

    { return cmp_max(a, b, ~0L); }

  int cmp(const char *a, uint32 a_length, const char *b, uint32 b_length);

  int cmp_binary(const char *a,const char *b, uint32 max_length=~0L);

  int key_cmp(const byte *,const byte*);

sql/lex.h

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

  { "ASCII",		SYM(ASCII_SYM)},

  { "ASENSITIVE",       SYM(ASENSITIVE_SYM)},

  { "AUTHORS",	        SYM(AUTHORS_SYM)},

  { "AUTO_INCREMENT",	SYM(AUTO_INC)},

  { "AVG",		SYM(AVG_SYM)},

  { "AVG_ROW_LENGTH",	SYM(AVG_ROW_LENGTH)},