From 1f85b1e069de59d9fbb9111624a3957a489c0afc Mon Sep 17 00:00:00 2001
From: unknown <sanja@askmonty.org>
Date: Mon, 4 Feb 2013 17:25:10 +0200
Subject: MDEV-3873: post-merge fix.

---
 sql/item_strfunc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
   }
-- 
cgit v1.2.1