diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:07:46 +0100 |
| commit | aca8e7ed6b176f28e8a34ebddc989574d93f305c (patch) | |
| tree | c0d20e5b3e9518f48d789e2220eea46d9010966d /sql/item_geofunc.cc | |
| parent | 750b9147fced7202b541be946e044eb739b20a03 (diff) | |
| parent | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (diff) | |
| download | mariadb-git-aca8e7ed6b176f28e8a34ebddc989574d93f305c.tar.gz | |
5.3 merge
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 bc89a6c14b3..e3e80bdf59f 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; - maybe_null= 1; + set_persist_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; - maybe_null= 1; + set_persist_maybe_null(1); } |