diff options
| author | Anel Husakovic <anel@mariadb.org> | 2018-04-16 20:49:27 +0000 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2019-09-03 01:53:30 -0700 |
| commit | 7afccf1f5e190782065f3b9f7b167adc42bd0825 (patch) | |
| tree | e298c83c0b080a8b4efb5b298fe8d62c9c69aaaa | |
| parent | ef00ac4c86daf3294c46a45358da636763fb0049 (diff) | |
| download | mariadb-git-bb-10.2-anel-default_charset.tar.gz | |
Enable the auto parametar of the flag `default-character-set`bb-10.2-anel-default_charset
When invoking option `--default-character-set=auto` character set
from underlying OS settings should be detected for mysqldump.
| -rw-r--r-- | client/mysqldump.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index b9ff8caed8c..134ef624d42 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1057,7 +1057,7 @@ static int get_options(int *argc, char ***argv) my_progname_short); return(EX_USAGE); } - if (strcmp(default_charset, charset_info->csname) && + if (strcmp(default_charset, MYSQL_AUTODETECT_CHARSET_NAME) && !(charset_info= get_charset_by_csname(default_charset, MY_CS_PRIMARY, MYF(MY_WME)))) exit(1); @@ -1522,6 +1522,9 @@ static int switch_character_set_results(MYSQL *mysql, const char *cs_name) char query_buffer[QUERY_LENGTH]; size_t query_length; + if (!strcmp(cs_name,MYSQL_AUTODETECT_CHARSET_NAME)) + cs_name = (char *)my_default_csname(); + /* Server lacks facility. This is not an error, by arbitrary decision . */ if (!server_supports_switching_charsets) return FALSE; |