summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorunknown <jani@rhols221.adsl.netsonic.fi>2002-08-28 13:14:11 +0300
committerunknown <jani@rhols221.adsl.netsonic.fi>2002-08-28 13:14:11 +0300
commitd5ececde0ccb760fc84b50908225ef95f9ce13a2 (patch)
tree59289dd43f08e74bda577cb43a483086756b7d68 /client/mysql.cc
parent5e14d715c82f0db59dab5e27aa4789c69cb06e77 (diff)
downloadmariadb-git-d5ececde0ccb760fc84b50908225ef95f9ce13a2.tar.gz
* Fixed a bug in my_getopt
* Fixed some spelling/language errors in mysqlcheck * Added some more information in mysql -client internal help. Docs/manual.texi: Added a note about bug fix in my_getopt to changelog section. client/mysql.cc: Added some information in mysql -client internal help. client/mysqlcheck.c: Fixed some spelling / language errors. mysys/my_getopt.c: Fixed a bug in my_getopt: --skip-external-locking didn't work and the same bug affected some other similar options. After fix it is now possible to use the following: --external-locking -> enable --external-locking=0 -> disable --external-locking=1 -> enable --skip-external-locking -> disable --skip-external-locking=0 -> enable --skip-external-locking=1 -> disable --enable-external-locking -> enable --enable-external-locking=0 -> disable --enable-external-locking=1 -> enable --skip-external-locking=garbage -> disable --enable-external-locking=garbage -> enable This works now with all options that are boolean type and which name doesn't start with --skip- or --enable-.
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 69633d1edce..05e758dd5bd 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -40,7 +40,7 @@
#include <signal.h>
#include <violite.h>
-const char *VER= "12.12";
+const char *VER= "12.13";
/* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024
@@ -1318,11 +1318,13 @@ com_help (String *buffer __attribute__((unused)),
{
reg1 int i;
- put_info("\nFull documentation of MySQL is available at\nhttp://www.mysql.com/documentation/mysql/bychapter/\n", INFO_INFO);
- put_info("For technical support contracts, visit https://order.mysql.com/\n", INFO_INFO);
- put_info("MySQL commands:",INFO_INFO);
+ 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("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);
+ put_info(" (Commands must appear first on line and end with ';')\n",
+ INFO_INFO);
for (i = 0; commands[i].name; i++)
{
if (commands[i].func)