diff options
author | unknown <monty@donna.mysql.com> | 2001-01-19 04:57:29 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2001-01-19 04:57:29 +0200 |
commit | 67891255f5d99c36832e54373fabfcfa758aa979 (patch) | |
tree | e6062d0caaa582f6d8fee0a4660b1e970681da48 /client | |
parent | e6b408608630b52955da5e76e5240e1da878f080 (diff) | |
download | mariadb-git-67891255f5d99c36832e54373fabfcfa758aa979.tar.gz |
Added MYSQL_SERVER_SUFFIX to mysqld
Fixed bug in TRIM
changed strnmov -> strmake
BUILD/SETUP.sh:
Removed --disable-shared
Docs/manual.texi:
Changelog
Installing many servers
acinclude.m4:
Force use of db-3.2.3h
client/mysql.cc:
cleanup
mysql-test/r/func_str.result:
Added new TRIM test
mysql-test/t/func_str.test:
Added new TRIM test
mysys/charset.c:
change to use strmake instead of strnmov
mysys/mf_format.c:
change to use strmake instead of strnmov
mysys/mf_tempfile.c:
change to use strmake instead of strnmov
scripts/make_binary_distribution.sh:
Removed error messages for missing files
sql/handler.cc:
More debug
sql/item_strfunc.cc:
Fixed bug in TRIM()
sql/mysqld.cc:
Added MYSQL_SERVER_SUFFIX to mysqld
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 edc2f7903df..82789269367 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -39,7 +39,7 @@ #include "my_readline.h" #include <signal.h> -const char *VER="11.11"; +const char *VER="11.12"; gptr sql_alloc(unsigned size); // Don't use mysqld alloc for these void sql_element_free(void *ptr); @@ -520,7 +520,7 @@ static void usage(int version) puts(" -W, --pipe Use named pipes to connect to server"); #endif printf("\n\ - -P --port=... Port number to use for connection.\n\ + -P, --port=... Port number to use for connection.\n\ -q, --quick Don't cache result, print it row by row. This may\n\ slow down the server if the output is suspended.\n\ Doesn't use history file.\n\ @@ -529,7 +529,7 @@ static void usage(int version) -S --socket=... Socket file to use for connection.\n"); #include "sslopt-usage.h" printf("\ - -t --table Output in table format.\n\ + -t, --table Output in table format.\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"); |