summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2004-12-22 16:02:27 +0400
committerunknown <bar@mysql.com>2004-12-22 16:02:27 +0400
commitcce8d0456ddcb17f9a8a471488a25936a2398b16 (patch)
tree8c65a8418fc29a1848f89d18937fb87edb89a560 /client
parentef1971ecb153e3a5e26e20018fdccdc8220780dd (diff)
downloadmariadb-git-cce8d0456ddcb17f9a8a471488a25936a2398b16.tar.gz
Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details
Diffstat (limited to 'client')
-rw-r--r--client/mysqldump.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c
index c36f9d3e23e..be2abd19822 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -613,6 +613,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
}
if (end!=compatible_mode_normal_str)
end[-1]= 0;
+ /*
+ Set charset to the default compiled value if it hasn't
+ been reset yet by --default-character-set=xxx.
+ */
+ if (default_charset == (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET)
+ default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;
break;
}
case (int) OPT_MYSQL_PROTOCOL: