diff options
| author | monty@mysql.com <> | 2004-07-07 11:29:39 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-07-07 11:29:39 +0300 |
| commit | 1e311999950833cd81ca0788cd3656585c46d9ae (patch) | |
| tree | ca8974710746bb69b04a49bc64f938d0b1a8420a /sql/sql_string.cc | |
| parent | 24a8dc2337a717ff340bac228383ef04437a4666 (diff) | |
| parent | 8462b8aeb83355fa6c5cb4f45ea0ed63ba9e0712 (diff) | |
| download | mariadb-git-1e311999950833cd81ca0788cd3656585c46d9ae.tar.gz | |
Merge with 4.1.3-beta
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 4d85438b03f..ba9431f27c4 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -24,7 +24,6 @@ #include <my_sys.h> #include <m_string.h> #include <m_ctype.h> -#include <assert.h> #ifdef HAVE_FCONVERT #include <floatingpoint.h> #endif @@ -371,7 +370,7 @@ bool String::copy(const char *str, uint32 arg_length, bool String::set_ascii(const char *str, uint32 arg_length) { - if (!(str_charset->state & MY_CS_NONTEXT)) + if (str_charset->mbminlen == 1) { set(str, arg_length, str_charset); return 0; |