diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-04-02 19:46:26 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-04-02 19:46:26 +0300 |
| commit | 556071359069d2fca415b3278a0b6717a056f82b (patch) | |
| tree | 247ef2fee863aec021e1b8fd9f79dd07ddacf291 /client | |
| parent | a8a63101d0c17fb080b2c47ea02441c060949f60 (diff) | |
| parent | 5ae86dca427fd69abcc6be4b19e9fe46629ad294 (diff) | |
| download | mariadb-git-556071359069d2fca415b3278a0b6717a056f82b.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
readline/Makefile.am:
Auto merged
sql/convert.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index be776997059..e97e349790e 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -39,7 +39,7 @@ #include <signal.h> #include <violite.h> -const char *VER="11.23"; +const char *VER="12.1"; /* Don't try to make a nice table if the data is too big */ #define MAX_COLUMN_LENGTH 1024 @@ -467,12 +467,12 @@ static struct option long_options[] = {"no-auto-rehash",no_argument, 0, 'A'}, {"no-beep", no_argument, 0, 'b'}, {"no-named-commands", no_argument, 0, 'g'}, - {"no-tee", no_argument, 0, OPT_NOTEE}, #ifndef __WIN__ {"no-pager", no_argument, 0, OPT_NOPAGER}, {"nopager", no_argument, 0, OPT_NOPAGER}, /* we are kind */ {"pager", optional_argument, 0, OPT_PAGER}, #endif + {"no-tee", no_argument, 0, OPT_NOTEE}, {"notee", no_argument, 0, OPT_NOTEE}, /* we are kind */ {"tee", required_argument, 0, OPT_TEE}, {"one-database", no_argument, 0, 'o'}, @@ -558,7 +558,7 @@ and you are welcome to modify and redistribute it under the GPL license\n"); still work from the first line.\n\ -G, --enable-named-commands\n\ Named commands are enabled. Opposite to -g.\n\ - -i, --ignore-space Ignore space after function names.\n\ + -i, --ignore-spaces Ignore spaces after function names.\n\ -h, --host=... Connect to host.\n\ -H, --html Produce HTML output.\n\ -X, --xml Produce XML output.\n\ |