diff options
| author | unknown <sanja@askmonty.org> | 2013-02-04 17:25:10 +0200 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-02-04 17:25:10 +0200 |
| commit | 1f85b1e069de59d9fbb9111624a3957a489c0afc (patch) | |
| tree | c594287bd0bb6a603476074e9c14df33f5539f92 /sql | |
| parent | 330d3a7d1f29e57da867b0ab2b138e5e95fb4415 (diff) | |
| download | mariadb-git-1f85b1e069de59d9fbb9111624a3957a489c0afc.tar.gz | |
MDEV-3873: post-merge fix.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_strfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index a42240f1b35..486b7cf36ef 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1038,7 +1038,7 @@ public: String *val_str(String *); void fix_length_and_dec() { - maybe_null= TRUE; + set_persist_maybe_null(1); collation.set(&my_charset_bin); decimals= 0; } |