diff options
author | Alexander Barkov <bar@mariadb.org> | 2017-09-15 20:59:04 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2017-09-15 20:59:04 +0400 |
commit | 65d26d1f31070b5b9c05eba4eb8f4432e56055e0 (patch) | |
tree | 6edf7fb465892e4a64cbfcde3ac071bf094582a1 /sql/item.h | |
parent | fa2701c6f7b028782cf231565f578b2fc0f10d51 (diff) | |
download | mariadb-git-65d26d1f31070b5b9c05eba4eb8f4432e56055e0.tar.gz |
MDEV-10191 non convertible chars convert() resulted in Null instead "?" on Windows
The problem was introduced by the patch for MDEV-7661,
which (in addition to the fix itself) included an attempt to make
CONVERT/CAST work in the same way with fields
(i.e. return NULL in strict mode if a non-convertable character found).
It appeared to be a bad idea and some users were affected by this
behavior change. Changing CONVERT/CAST not depend on sql_mode
(restoring pre-10.1.4 behavior).
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 8ee76a626d4..c338b14e340 100644 --- a/sql/item.h +++ b/sql/item.h @@ -548,8 +548,7 @@ class Item_func_not; class Item_splocal; /** - String_copier that honors the current sql_mode (strict vs non strict) - and can send warnings. + String_copier that sends Item specific warnings. */ class String_copier_for_item: public String_copier { |