mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed comparation with string constant on some platform (BUG#7651)

Browse source
This commit is contained in:
bell@sanja.is.com.ua 2005-01-06 19:13:58 +02:00
parent 421738e8ce
commit 779c33a5e7
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/mysqldump.c
View file

@ -106,7 +106,14 @@ FILE *md_result_file;
static char *shared_memory_base_name=0; static char *shared_memory_base_name=0;
#endif #endif
static uint opt_protocol= 0; static uint opt_protocol= 0;
static char *default_charset= (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET; /*
Constant for detection default value of default_charset (if
default_charset equal to mysql_universal_client_charset, then it is
default value which assigned in very beginning on main())
*/
const static char *mysql_universal_client_charset=
MYSQL_UNIVERSAL_CLIENT_CHARSET;
static char *default_charset;
static CHARSET_INFO *charset_info= &my_charset_latin1; static CHARSET_INFO *charset_info= &my_charset_latin1;
const char *default_dbug_option="d:t:o,/tmp/mysqldump.trace"; const char *default_dbug_option="d:t:o,/tmp/mysqldump.trace";
@ -678,7 +685,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
Set charset to the default compiled value if it hasn't Set charset to the default compiled value if it hasn't
been reset yet by --default-character-set=xxx. been reset yet by --default-character-set=xxx.
*/ */
if (default_charset == (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET) if (default_charset == mysql_universal_client_charset)
default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME; default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;
break; break;
} }
@ -2403,6 +2410,7 @@ cleanup:
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
compatible_mode_normal_str[0]= 0; compatible_mode_normal_str[0]= 0;
default_charset= (char *)mysql_universal_client_charset;
MY_INIT(argv[0]); MY_INIT(argv[0]);
if (get_options(&argc, &argv)) if (get_options(&argc, &argv))