diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-16 22:31:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-17 11:05:33 +0300 |
| commit | d9277732d7dbe7e3793c70cdc769ade16168695d (patch) | |
| tree | 1fdf3a99a924ef9c2f73ac6e9a7027eaa8048d13 /sql/item_timefunc.cc | |
| parent | c2815c7c2c7f9dcf4e9f241e10d154faf561103f (diff) | |
| parent | 836d4e74d9416a1af839f8068c5a07bee6f4b71e (diff) | |
| download | mariadb-git-d9277732d7dbe7e3793c70cdc769ade16168695d.tar.gz | |
Merge 10.1 into 10.2
This should also fix the MariaDB 10.2.2 bug
MDEV-13826 CREATE FULLTEXT INDEX on encrypted table fails.
MDEV-12634 FIXME: Modify innodb-index-online, innodb-table-online
so that they will write and read merge sort files. InnoDB 5.7
introduced some optimizations to avoid using the files for small tables.
Many collation test results have been adjusted for MDEV-10191.
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 70f160991d0..599d818cf3f 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2422,7 +2422,7 @@ String *Item_char_typecast::copy(String *str, CHARSET_INFO *strcs) if (copier.copy_with_warn(cast_cs, &tmp_value, strcs, str->ptr(), str->length(), cast_length)) { - null_value= 1; // In strict mode: malformed data or could not convert + null_value= 1; // EOM return 0; } check_truncation_with_warn(str, copier.source_end_pos() - str->ptr()); |