database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

mysqlimport.c, mysqldump.c, mysqlcheck.c, mysql.cc:

Browse Source 
No needs to load charset index if the character set is build-in.
This commit is contained in:
bar@bar.intranet.mysql.r18.ru
2004-02-11 15:15:39 +04:00
parent f8f0c212f3
commit 251bf4ab85
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysql.cc
View File

@@ -839,7 +839,9 @@ 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_csname(default_charset,
if (strcmp(default_charset, charset_info->csname) &&
!(charset_info= get_charset_by_csname(default_charset,
MY_CS_PRIMARY, MYF(MY_WME)))) MY_CS_PRIMARY, MYF(MY_WME))))
exit(1); exit(1);
if (argc > 1) if (argc > 1)

3
client/mysqlcheck.c
View File

@@ -311,7 +311,8 @@ static int get_options(int *argc, char ***argv)
} }
/* TODO: This variable is not yet used */ /* TODO: This variable is not yet used */
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)))) 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

@@ -536,7 +536,8 @@ static int get_options(int *argc, char ***argv)
my_progname); my_progname);
return(1); 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)))) 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

@@ -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"); 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_csname(default_charset, if (strcmp(default_charset, charset_info->csname) &&
!(charset_info= get_charset_by_csname(default_charset,
MY_CS_PRIMARY, MYF(MY_WME)))) MY_CS_PRIMARY, MYF(MY_WME))))
exit(1); exit(1);
if (*argc < 2) if (*argc < 2)