diff options
| author | unknown <serg@serg.mylan> | 2005-01-12 21:11:55 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-12 21:11:55 +0100 |
| commit | cad76938c0faee9d18fb95acd3fe08cdcdb5aada (patch) | |
| tree | b22b6cd04ace53be22aedc800184e97edc556fb8 /mysys | |
| parent | 581c2148c4c2e13c76cf4b57ae0c74964e2ab651 (diff) | |
| parent | fd7e0d847b6fd2d0f9729b3c6a37f19e62d67128 (diff) | |
| download | mariadb-git-cad76938c0faee9d18fb95acd3fe08cdcdb5aada.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/charset-def.c | 10 | ||||
| -rw-r--r-- | mysys/default.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mysys/charset-def.c b/mysys/charset-def.c index 3dcd2a2d116..b8676a5d3d4 100644 --- a/mysys/charset-def.c +++ b/mysys/charset-def.c @@ -81,10 +81,20 @@ my_bool init_compiled_charsets(myf flags __attribute__((unused))) add_compiled_collation(&my_charset_cp1250_czech_ci); #endif +#ifdef HAVE_CHARSET_cp932 + add_compiled_collation(&my_charset_cp932_japanese_ci); + add_compiled_collation(&my_charset_cp932_bin); +#endif + #ifdef HAVE_CHARSET_latin2 add_compiled_collation(&my_charset_latin2_czech_ci); #endif +#ifdef HAVE_CHARSET_eucjpms + add_compiled_collation(&my_charset_eucjpms_japanese_ci); + add_compiled_collation(&my_charset_eucjpms_bin); +#endif + #ifdef HAVE_CHARSET_euckr add_compiled_collation(&my_charset_euckr_korean_ci); add_compiled_collation(&my_charset_euckr_bin); diff --git a/mysys/default.c b/mysys/default.c index 0b3f830d476..73dca3b6c2f 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -119,7 +119,7 @@ static int search_files(const char *conf_file, int *argc, char ***argv, if (defaults_extra_file) defaults_extra_file= strchr(defaults_extra_file,'=')+1; - args_used+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0); + (*args_used)+= (forced_default_file ? 1 : 0) + (defaults_extra_file ? 1 : 0); if (forced_default_file) { |