database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge with 4.1.3-beta

Browse Source
This commit is contained in:
monty@mysql.com
2004-07-07 11:29:39 +03:00
parent 24a8dc2337 8462b8aeb8
commit 1e31199995
1727 changed files with 63933 additions and 40199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_string.cc
View File

@ -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;