diff options
| author | unknown <sanja@askmonty.org> | 2013-09-26 21:20:15 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-09-26 21:20:15 +0300 |
| commit | e5746665c9f8dcfa66a7a645f1c5517769a2fa0a (patch) | |
| tree | 56e9d83b5ef43f93d9628c25f69b81f174d48f5c /sql/item_geofunc.cc | |
| parent | 828be0d9bae813d0587fbede6e02b12eebac66ca (diff) | |
| parent | 9d83468e78ba23f024ce3c11443913ad75cf1ea5 (diff) | |
| download | mariadb-git-e5746665c9f8dcfa66a7a645f1c5517769a2fa0a.tar.gz | |
merge 10.0-base -> 10.0
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 b36375a6e40..665c941414c 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; } |