diff options
| author | bar@bar.mysql.r18.ru <> | 2003-06-03 14:59:17 +0500 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-06-03 14:59:17 +0500 |
| commit | 759214fa418c5570925ba1d5efd5a154e3b7c076 (patch) | |
| tree | f7bb603f0c1323874da13a5e0f5bc44f6781cada /sql/sql_string.cc | |
| parent | 7342852dd93d16385b69af08e30d6747a2f358e3 (diff) | |
| download | mariadb-git-759214fa418c5570925ba1d5efd5a154e3b7c076.tar.gz | |
MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now)
Some default_charset_info were removed
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 6077c42bd1d..cf6645fa23e 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -265,9 +265,9 @@ bool String::copy(const char *str, uint32 arg_length, */ -bool String::set_latin1(const char *str, uint32 arg_length) +bool String::set_ascii(const char *str, uint32 arg_length) { - if (str_charset->mbmaxlen == 1) + if (!(str_charset->state & MY_CS_NONTEXT)) { set(str, arg_length, str_charset); return 0; |