diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-22 14:37:01 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-22 14:37:01 +0500 |
| commit | 3565727359aaea5f2fab3740d71d36fb9015f77a (patch) | |
| tree | 6d9c35fee0f4f20dc03b332e042547963bed5e4c /client | |
| parent | a2867c7ae93f760106ffc45086efa372cbf884dd (diff) | |
| download | mariadb-git-3565727359aaea5f2fab3740d71d36fb9015f77a.tar.gz | |
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..
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 3 | ||||
| -rw-r--r-- | client/mysqlcheck.c | 3 | ||||
| -rw-r--r-- | client/mysqldump.c | 3 | ||||
| -rw-r--r-- | client/mysqlimport.c | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 155d8b03231..f421756f0b4 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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) { diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index cd8cd0ef82e..8f599c9f497 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -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) { diff --git a/client/mysqldump.c b/client/mysqldump.c index 17780458a2a..6a577af8792 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -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)) { diff --git a/client/mysqlimport.c b/client/mysqlimport.c index efb117280c4..f247301c6dc 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -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) { |