Skip to content

Commit 3793da4

Browse files
committed
Enable the auto parameter of the flag default-character-set
Closes #739 When invoking option `--default-character-set=auto` character set from underlying OS settings should be detected for mysqldump.
1 parent 3422c13 commit 3793da4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

client/mysqldump.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ static int get_options(int *argc, char ***argv)
10571057
my_progname_short);
10581058
return(EX_USAGE);
10591059
}
1060-
if (strcmp(default_charset, charset_info->csname) &&
1060+
if (strcmp(default_charset, MYSQL_AUTODETECT_CHARSET_NAME) &&
10611061
!(charset_info= get_charset_by_csname(default_charset,
10621062
MY_CS_PRIMARY, MYF(MY_WME))))
10631063
exit(1);
@@ -1522,6 +1522,9 @@ static int switch_character_set_results(MYSQL *mysql, const char *cs_name)
15221522
char query_buffer[QUERY_LENGTH];
15231523
size_t query_length;
15241524

1525+
if (!strcmp(cs_name, MYSQL_AUTODETECT_CHARSET_NAME))
1526+
cs_name= (char *)my_default_csname();
1527+
15251528
/* Server lacks facility. This is not an error, by arbitrary decision . */
15261529
if (!server_supports_switching_charsets)
15271530
return FALSE;

0 commit comments

Comments
 (0)