Commit 6d668850 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/eric/fed-txn-mysql-5.1-new
parents 3fdddf12 a80ba53e

BUILD/compile-sap

deleted100755 → 0
+0 −9
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags"

extra_configs="$pentium_configs --without-berkeley-db"



. "$path/FINISH.sh"

BUILD/compile-sap-debug

deleted100755 → 0
+0 −9
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags"

extra_configs="$pentium_configs $debug_configs --without-berkeley-db $static_link"



. "$path/FINISH.sh"

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}

};