summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <jani@prima.mysql.com>2000-11-20 21:22:02 +0200
committerunknown <jani@prima.mysql.com>2000-11-20 21:22:02 +0200
commitca7f2d94be5c55ebef7ee3d86138aeb7af1fe903 (patch)
tree211571a6a007b153874884eab37471be755dd5b5 /client
parentc21988993eaa0fe8d7c85e75559fbaf0d613222c (diff)
downloadmariadb-git-ca7f2d94be5c55ebef7ee3d86138aeb7af1fe903.tar.gz
Added documentation.
Docs/manual.texi: Added documentation about new pager and tee features in mysql client. Added an example about the vertical output. client/mysql.cc: Small documentation changes.
Diffstat (limited to 'client')
-rw-r--r--client/mysql.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index a855288ddb0..e5246aac6c5 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -109,7 +109,7 @@ static HashTable ht;
enum enum_info_type { INFO_INFO,INFO_ERROR,INFO_RESULT};
typedef enum enum_info_type INFO_TYPE;
-const char *VER="11.5";
+const char *VER="11.6";
static MYSQL mysql; /* The connection */
static bool info_flag=0,ignore_errors=0,wait_flag=0,quick=0,
@@ -496,14 +496,12 @@ static void usage(int version)
Give a variable an value. --help lists variables.\n\
-o, --one-database Only update the default database. This is useful\n\
for skipping updates to other database in the update\n\
- log.\n\
- --tee=... Append everything into outfile. See interactive help\n\
- (\\h) also. Does not work in batch mode.\n");
+ log.\n");
#ifndef __WIN__
printf("\
--pager[=...] Output type. Default is your ENV variable PAGER.\n\
Valid pagers are less, more, cat [> filename], etc.\n\
- See interactive help (\\h) also. This options does\n\
+ See interactive help (\\h) also. This option does\n\
not work in batch mode.\n");
#endif
printf("\
@@ -524,7 +522,9 @@ static void usage(int version)
#include "sslopt-usage.h"
printf("\
-t --table Output in table format.\n\
- -T, --debug-info Print some debug info at exit.\n");
+ -T, --debug-info Print some debug info at exit.\n\
+ --tee=... Append everything into outfile. See interactive help\n\
+ (\\h) also. Does not work in batch mode.\n");
#ifndef DONT_ALLOW_USER_CHANGE
printf("\
-u, --user=# User for login if not current user.\n");
@@ -1760,7 +1760,7 @@ com_pager(String *buffer, char *line __attribute__((unused)))
{
if (!strlen(default_pager))
{
- tee_fprintf(stdout, "Default pager wasn't available, using stdout.\n");
+ tee_fprintf(stdout, "Default pager wasn't set, using stdout.\n");
opt_nopager=1;
strmov(pager, "stdout");
PAGER= stdout;