diff options
| author | unknown <sanja@askmonty.org> | 2013-09-25 17:16:13 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-09-25 17:16:13 +0300 |
| commit | 64d6d8334fa63a0faa6d91ded21eca8e3871c7ec (patch) | |
| tree | c313ec7d9f9db0c90649df5297e2d39230986291 /sql/item_geofunc.cc | |
| parent | 72dffd878e47e4fcfd224cadfea06caed0ac956b (diff) | |
| parent | ec7da1561e028aac40dee69433113978c982ce84 (diff) | |
| download | mariadb-git-64d6d8334fa63a0faa6d91ded21eca8e3871c7ec.tar.gz | |
merge 5.3 -> 5.5
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 0a7f18e6546..b5289c9b3cc 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -53,7 +53,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; } @@ -147,7 +147,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; } |