mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
mysqlimport.c, mysqldump.c, mysqlcheck.c:
Bug fix: latin1 is not compiled charset and is not specified.. mysql.cc: Bug fix: latin1 is not compiled charset and is not specified... client/mysql.cc: Bug fix: latin1 is not compiled charset and is not specified... client/mysqlcheck.c: Bug fix: latin1 is not compiled charset and is not specified.. client/mysqldump.c: Bug fix: latin1 is not compiled charset and is not specified.. client/mysqlimport.c: Bug fix: latin1 is not compiled charset and is not specified..
This commit is contained in:
parent
a2867c7ae9
commit
3565727359
4 changed files with 8 additions and 4 deletions
|
|
@ -809,7 +809,8 @@ static int get_options(int argc, char **argv)
|
|||
opt_reconnect= 0;
|
||||
connect_flag= 0; /* Not in interactive mode */
|
||||
}
|
||||
if (!(charset_info= get_charset_by_name(default_charset, MYF(MY_WME))))
|
||||
if (!(charset_info= get_charset_by_csname(default_charset,
|
||||
MY_CS_PRIMARY, MYF(MY_WME))))
|
||||
exit(1);
|
||||
if (argc > 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -308,7 +308,8 @@ static int get_options(int *argc, char ***argv)
|
|||
else
|
||||
what_to_do = DO_CHECK;
|
||||
}
|
||||
if (!(charset_info= get_charset_by_name(default_charset, MYF(MY_WME))))
|
||||
if (!(charset_info= get_charset_by_csname(default_charset,
|
||||
MY_CS_PRIMARY, MYF(MY_WME))))
|
||||
exit(1);
|
||||
if (*argc > 0 && opt_alldbs)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -492,7 +492,8 @@ static int get_options(int *argc, char ***argv)
|
|||
my_progname);
|
||||
return(1);
|
||||
}
|
||||
if (!(charset_info= get_charset_by_name(default_charset, MYF(MY_WME))))
|
||||
if (!(charset_info= get_charset_by_csname(default_charset,
|
||||
MY_CS_PRIMARY, MYF(MY_WME))))
|
||||
exit(1);
|
||||
if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -239,7 +239,8 @@ static int get_options(int *argc, char ***argv)
|
|||
fprintf(stderr, "You can't use --ignore (-i) and --replace (-r) at the same time.\n");
|
||||
return(1);
|
||||
}
|
||||
if (!(charset_info= get_charset_by_name(default_charset, MYF(MY_WME))))
|
||||
if (!(charset_info= get_charset_by_csname(default_charset,
|
||||
MY_CS_PRIMARY, MYF(MY_WME))))
|
||||
exit(1);
|
||||
if (*argc < 2)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue