diff options
| author | unknown <serg@serg.mylan> | 2004-06-23 21:47:07 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-23 21:47:07 +0200 |
| commit | 253e0a213be0dfff1c201d62081ec05cbd1bfae8 (patch) | |
| tree | 6cd5f4008934990cdea25b8a9a29edcec8c12790 /client/mysqldump.c | |
| parent | 66bece2018bf2f6c7143b1619dd88e0b8e4c9a0e (diff) | |
| parent | 006a624c68a1ad7a66ec7167a69e548f21daed3d (diff) | |
| download | mariadb-git-253e0a213be0dfff1c201d62081ec05cbd1bfae8.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/handler.cc:
Auto merged
Diffstat (limited to 'client/mysqldump.c')
| -rw-r--r-- | client/mysqldump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 779af596459..7b472522ab3 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -242,7 +242,7 @@ static struct my_option my_long_options[] = "Deprecated, use --set-charset or --skip-set-charset to enable/disable charset settings instead", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"set-charset", OPT_SET_CHARSET, - "'SET CHARACTER_SET_CLIENT=default_character_set' will be put in the output", + "Add 'SET NAMES default_character_set' to the output. Enabled by default; suppress with --skip-set-charset.", (gptr*) &opt_set_charset, (gptr*) &opt_set_charset, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"set-variable", 'O', |