Commit 8543e6d7 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_open.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
parents 2c8acb9e faa0c00e

client/mysql.cc

+8 −4
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static struct my_option my_long_options[] = 
  {"help", 'I', "Synonym for -?", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,

   0, 0, 0, 0, 0},

#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"auto-rehash", OPT_AUTO_REHASH,
@@ -1872,9 +1872,13 @@ com_help(String *buffer __attribute__((unused)), 
  if (help_arg)

    return com_server_help(buffer,line,help_arg+1);



  put_info("\nFor the complete MySQL Manual online, visit:\n   http://www.mysql.com/documentation\n", INFO_INFO);

  put_info("For info on technical support from MySQL developers, visit:\n   http://www.mysql.com/support\n", INFO_INFO);

  put_info("For info on MySQL books, utilities, consultants, etc., visit:\n   http://www.mysql.com/portal\n", INFO_INFO);

  put_info("\nFor information about MySQL products and services, visit:\n"

           "   http://www.mysql.com/\n"

           "For developer information, including the MySQL Reference Manual, "

           "visit:\n"

           "   http://dev.mysql.com/\n"

           "To buy MySQL Network Support, training, or other products, visit:\n"

           "   https://shop.mysql.com/\n", INFO_INFO);

  put_info("List of all MySQL commands:", INFO_INFO);

  if (!named_cmds)

    put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static TYPELIB command_typelib= 
static struct my_option my_long_options[] =

{

#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"count", 'c',

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static struct my_option my_long_options[] = 
{



#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  /*

client/mysqlcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static struct my_option my_long_options[] = 
   (gptr*) &opt_all_in_1, (gptr*) &opt_all_in_1, 0, GET_BOOL, NO_ARG, 0, 0, 0,

   0, 0, 0},

#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"auto-repair", OPT_AUTO_REPAIR,

client/mysqldump.c

+3 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static struct my_option my_long_options[] = 
   "Allow creation of column names that are keywords.", (gptr*) &opt_keywords,

   (gptr*) &opt_keywords, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

#ifdef __NETWARE__

  {"auto-close", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

  {"autoclose", OPT_AUTO_CLOSE, "Auto close the screen on exit for Netware.",

   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"character-sets-dir", OPT_CHARSETS_DIR,
@@ -1841,12 +1841,13 @@ DELIMITER ;;\n"); 
  while ((row= mysql_fetch_row(result)))

  {

    fprintf(sql_file, "/*!50003 SET SESSION SQL_MODE=\"%s\" */;;\n\

/*!50003 CREATE TRIGGER %s %s %s ON %s FOR EACH ROW%s */;;\n\n",

/*!50003 CREATE TRIGGER %s %s %s ON %s FOR EACH ROW%s%s */;;\n\n",

            row[6], /* sql_mode */

            quote_name(row[0], name_buff, 0), /* Trigger */

            row[4], /* Timing */

            row[1], /* Event */

            result_table,

	    (strchr(" \t\n\r", *(row[3]))) ? "" : " ",

            row[3] /* Statement */);

  }

  if (mysql_num_rows(result))