diff options
| author | unknown <sanja@askmonty.org> | 2013-09-25 15:30:13 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-09-25 15:30:13 +0300 |
| commit | ec7da1561e028aac40dee69433113978c982ce84 (patch) | |
| tree | df2b7923621ea7a4a2003a3e018ce1e35d665507 /sql/item_geofunc.cc | |
| parent | 779003e18073332a73ed185410f95acc1ef85094 (diff) | |
| download | mariadb-git-ec7da1561e028aac40dee69433113978c982ce84.tar.gz | |
MDEV-5039: incorrect Item_func_regex::update_used_tables()
Other fix of maybe_null problem and revert of revno: 3608 "MDEV-3873 & MDEV-3876 & MDEV-3912 : Wrong result (extra rows) with ALL subquery from a MERGE view."
Diffstat (limited to 'sql/item_geofunc.cc')
| -rw-r--r-- | sql/item_geofunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 1168813e275..211140c029b 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -52,7 +52,7 @@ void Item_geometry_func::fix_length_and_dec() collation.set(&my_charset_bin); decimals=0; max_length= (uint32) 4294967295U; - set_persist_maybe_null(1); + maybe_null= 1; } @@ -145,7 +145,7 @@ void Item_func_as_wkt::fix_length_and_dec() { collation.set(default_charset(), DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); max_length=MAX_BLOB_WIDTH; - set_persist_maybe_null(1); + maybe_null= 1; } |