diff options
| author | unknown <root@home.(none)> | 2003-03-16 10:56:14 +0400 |
|---|---|---|
| committer | unknown <root@home.(none)> | 2003-03-16 10:56:14 +0400 |
| commit | 6b11fa3a247e9dd961f0a570a208cedeb750c1a7 (patch) | |
| tree | 460a8abc4de11ac2745df4507cc3edbbda326194 /client | |
| parent | a4d8174473161708be20bfa1c18bee988bd51ed8 (diff) | |
| download | mariadb-git-6b11fa3a247e9dd961f0a570a208cedeb750c1a7.tar.gz | |
set_default_charset() is not used anymore
Some system_charset_info were removed
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | client/mysqlcheck.c | 2 | ||||
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | client/mysqlimport.c | 2 | ||||
| -rw-r--r-- | client/sql_string.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index f784f529c46..03f8d226d13 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -790,7 +790,7 @@ static int get_options(int argc, char **argv) } if (default_charset) { - if (set_default_charset_by_name(default_charset, MYF(MY_WME))) + if (!(system_charset_info= get_charset_by_name(default_charset, MYF(MY_WME)))) exit(1); } if (argc > 1) diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index cd67a2c7522..0333833ba11 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -309,7 +309,7 @@ static int get_options(int *argc, char ***argv) } if (default_charset) { - if (set_default_charset_by_name(default_charset, MYF(MY_WME))) + if (!(system_charset_info= get_charset_by_name(default_charset, MYF(MY_WME)))) exit(1); } if (*argc > 0 && opt_alldbs) diff --git a/client/mysqldump.c b/client/mysqldump.c index 49bc56890fb..18755b7a913 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -483,7 +483,7 @@ static int get_options(int *argc, char ***argv) } if (default_charset) { - if (set_default_charset_by_name(default_charset, MYF(MY_WME))) + if (!(system_charset_info= get_charset_by_name(default_charset, MYF(MY_WME)))) exit(1); } if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs)) diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 408a5873589..ff6895145f7 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -239,7 +239,7 @@ static int get_options(int *argc, char ***argv) } if (default_charset) { - if (set_default_charset_by_name(default_charset, MYF(MY_WME))) + if (!(system_charset_info= get_charset_by_name(default_charset, MYF(MY_WME)))) exit(1); } if (*argc < 2) diff --git a/client/sql_string.h b/client/sql_string.h index 42f9e446981..33f34a43b7f 100644 --- a/client/sql_string.h +++ b/client/sql_string.h @@ -39,12 +39,12 @@ public: String() { Ptr=0; str_length=Alloced_length=0; alloced=0; - str_charset=default_charset_info; + str_charset= &my_charset_latin1; } String(uint32 length_arg) { alloced=0; Alloced_length=0; (void) real_alloc(length_arg); - str_charset=default_charset_info; + str_charset= &my_charset_latin1; } String(const char *str, CHARSET_INFO *cs) { |