1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mysqlimport.c, mysqldump.c, mysqlcheck.c:

Browse Source 
Bug fix: latin1 is not compiled charset and is not specified..
mysql.cc:
  Bug fix: latin1 is not compiled charset and is not specified...
This commit is contained in:
bar@bar.mysql.r18.ru 2003-05-22 14:37:01 +05:00
parent 944bc89561
commit b1adadd510
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/mysql.cc
View File

@ -809,7 +809,8 @@ static int get_options(int argc, char **argv)
opt_reconnect= 0; opt_reconnect= 0;
connect_flag= 0; /* Not in interactive mode */ 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); exit(1);
if (argc > 1) if (argc > 1)
{ {

3
client/mysqlcheck.c
View File

@ -308,7 +308,8 @@ static int get_options(int *argc, char ***argv)
else else
what_to_do = DO_CHECK; 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); exit(1);
if (*argc > 0 && opt_alldbs) if (*argc > 0 && opt_alldbs)
{ {

3
client/mysqldump.c
View File

@ -492,7 +492,8 @@ static int get_options(int *argc, char ***argv)
my_progname); my_progname);
return(1); 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); exit(1);
if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs)) if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs))
{ {

3
client/mysqlimport.c
View File

@ -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"); fprintf(stderr, "You can't use --ignore (-i) and --replace (-r) at the same time.\n");
return(1); 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); exit(1);
if (*argc < 2) if (*argc < 2)
{ {