diff options
| author | unknown <monty@mysql.com> | 2004-02-09 13:59:41 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-09 13:59:41 +0100 |
| commit | 74b81a801785058706b46a1e75b67b026c468d04 (patch) | |
| tree | 8a4c27f40f9f6b198bd0c9b9b5a7bf3c49138f78 /sql/field.cc | |
| parent | 1c810278bd5e1d69f8612b047784e46b4ba7cd46 (diff) | |
| download | mariadb-git-74b81a801785058706b46a1e75b67b026c468d04.tar.gz | |
Ensure that result from date_format() is binary
Removed warnings from test suite
mysql-test/r/ctype_utf8.result:
Update results after fix of return argument from date_format()
mysql-test/r/date_formats.result:
Remove unnecessary warnings
mysql-test/r/type_decimal.result:
Remove unnecessary warnings
mysql-test/r/warnings.result:
Remove unnecessary warnings
mysql-test/t/ctype_utf8.test:
Fixed test
mysql-test/t/date_formats.test:
Remove unnecessary warnings
mysql-test/t/type_decimal.test:
Remove unnecessary warnings
mysql-test/t/warnings.test:
Remove unnecessary warnings
sql/field.cc:
Optimize
sql/item_timefunc.cc:
Ensure that result from date_format() is binary
strings/ctype-simple.c:
Better names for arguments
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 6f29737e4a0..cce7446dcff 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4072,7 +4072,7 @@ int Field_string::store(const char *from,uint length,CHARSET_INFO *cs) } /* - Make sure we don't break a multybite sequence + Make sure we don't break a multibyte sequence as well as don't copy a malformed data. */ copy_length= field_charset->cset->wellformedlen(field_charset, @@ -4084,8 +4084,7 @@ int Field_string::store(const char *from,uint length,CHARSET_INFO *cs) field_charset->cset->fill(field_charset,ptr+copy_length, field_length-copy_length,' '); - - if (current_thd->count_cuted_fields && (copy_length < length)) + if ((copy_length < length) && current_thd->count_cuted_fields) { // Check if we loosed some info const char *end=from+length; from+= copy_length; |