[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 5.0 tree (dean:1.2008)
From:       Dean Ellis <dean () mysql ! com>
Date:       2005-12-28 14:54:51
Message-ID: E1ErchV-0007Ao-LZ () niflheim ! lan
[Download RAW message or body]

Below is the list of changes that have just been committed into a local
5.0 repository of dellis. When dellis does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2008 05/12/28 08:54:45 dean@mysql.com +1 -0
  Merge dellis@bk-internal.mysql.com:/home/bk/mysql-5.0
  into  mysql.com:/home/dellis/mysqlab/bk/mysql-5.0

  client/mysql.cc
    1.190 05/12/28 08:54:38 dean@mysql.com +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dean
# Host:	niflheim.lan
# Root:	/home/dellis/mysqlab/bk/mysql-5.0/RESYNC

--- 1.189/client/mysql.cc	2005-11-01 20:17:03 -06:00
+++ 1.190/client/mysql.cc	2005-12-28 08:54:38 -06:00
@@ -259,7 +259,7 @@
   { "quit",   'q', com_quit,   0, "Quit mysql." },
   { "rehash", '#', com_rehash, 0, "Rebuild completion hash." },
   { "source", '.', com_source, 1,
-    "Execute a SQL script file. Takes a file name as an argument."},
+    "Execute an SQL script file. Takes a file name as an argument."},
   { "status", 's', com_status, 0, "Get status information from the server."},
 #ifdef USE_POPEN
   { "system", '!', com_shell,  1, "Execute a system shell command."},
@@ -527,7 +527,7 @@
   {"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,
@@ -728,7 +728,7 @@
 	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
          readline, rl_library_version);
 #else
-  printf("%s  Ver %s Distrib %s, for %s (%s)", my_progname, VER,
+  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,
 	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
 #endif
 
@@ -1872,9 +1872,13 @@
   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);

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com



[prev in list] [next in list] [prev in thread] [next in thread]