diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2004-02-11 15:15:39 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2004-02-11 15:15:39 +0400 |
| commit | 24e3862cb8752618a5c8d5a41eb739e698b727cb (patch) | |
| tree | 3eebe7846b394a5526e0b0d8e1a4f4c243b8b62c /client/mysqlimport.c | |
| parent | 6b86e0ebc606f52c38eeb98c580e7a9b2c43f0f6 (diff) | |
| download | mariadb-git-24e3862cb8752618a5c8d5a41eb739e698b727cb.tar.gz | |
mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:
No needs to load charset index if the character set is build-in.
client/mysql.cc:
No needs to load charset index if the character set is build-in.
client/mysqlcheck.c:
No needs to load charset index if the character set is build-in.
client/mysqldump.c:
No needs to load charset index if the character set is build-in.
client/mysqlimport.c:
No needs to load charset index if the character set is build-in.
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 5ad6d1dc429..d47ae48b1ac 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -238,7 +238,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_csname(default_charset, + if (strcmp(default_charset, charset_info->csname) && + !(charset_info= get_charset_by_csname(default_charset, MY_CS_PRIMARY, MYF(MY_WME)))) exit(1); if (*argc < 2) |