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

MYSQL_UNIVERSAL_CLIENT_CHARSET definition has been added.

Browse Source
This commit is contained in:
unknown 2003-12-19 14:12:29 +04:00
parent fddddc2c23
commit 3344aefc5a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysqldump.c
View File

@ -89,11 +89,7 @@ static char insert_pat[12 * 1024],*opt_password=0,*current_user=0,
*where=0, *where=0,
*opt_compatible_mode_str= 0, *opt_compatible_mode_str= 0,
*err_ptr= 0; *err_ptr= 0;
#ifdef HAVE_CHARSET_utf8 static char *default_charset= (char*) MYSQL_UNIVERSAL_CLIENT_CHARSET;
static char *default_charset= (char*) "utf8";
#else
static char *default_charset= (char*) MYSQL_DEFAULT_CHARSET_NAME;
#endif
static ulong opt_compatible_mode= 0; static ulong opt_compatible_mode= 0;
static uint opt_mysql_port= 0, err_len= 0; static uint opt_mysql_port= 0, err_len= 0;
static my_string opt_mysql_unix_port=0; static my_string opt_mysql_unix_port=0;

6
include/my_global.h
View File

@ -1144,4 +1144,10 @@ typedef union {
#endif #endif
#endif #endif
#ifdef HAVE_CHARSET_utf8
#define MYSQL_UNIVERSAL_CLIENT_CHARSET "utf8"
#else
#define MYSQL_UNIVERSAL_CLIENT_CHARSET MYSQL_DEFAULT_CHARSET_NAME
#endif
#endif /* my_global_h */ #endif /* my_global_h */