[Commits] Rev 3495: MDEV-3873: post-merge fix. in file:///home/bell/maria/bzr/work-maria-10.0-base-MDEV-3873/

sanja at askmonty.org sanja at askmonty.org
Mon Feb 4 17:25:12 EET 2013


At file:///home/bell/maria/bzr/work-maria-10.0-base-MDEV-3873/

------------------------------------------------------------
revno: 3495
revision-id: sanja at askmonty.org-20130204152510-6gvz4s23u7y4lkxt
parent: sergii at pisem.net-20130204104757-efm2ndkxz5ek114c
committer: sanja at askmonty.org
branch nick: work-maria-10.0-base-MDEV-3873
timestamp: Mon 2013-02-04 17:25:10 +0200
message:
  MDEV-3873: post-merge fix.
-------------- next part --------------
=== modified file 'sql/item_strfunc.h'
--- a/sql/item_strfunc.h	2013-01-29 14:10:47 +0000
+++ b/sql/item_strfunc.h	2013-02-04 15:25:10 +0000
@@ -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;
   }



More information about the commits mailing list