[Commits] Rev 3226: merge 5.1->5.2 in file:///home/bell/maria/bzr/work-maria-5.2-merge-5.1/

sanja at montyprogram.com sanja at montyprogram.com
Wed Mar 12 18:43:52 EET 2014


At file:///home/bell/maria/bzr/work-maria-5.2-merge-5.1/

------------------------------------------------------------
revno: 3226 [merge]
revision-id: sanja at montyprogram.com-20140312164344-0h1aq2m2tbd43xiv
parent: sergii at pisem.net-20140213072533-gkbllmcu4qkp9024
parent: sanja at montyprogram.com-20140312135000-bvn5uk6zio1jw5ap
committer: sanja at montyprogram.com
branch nick: work-maria-5.2-merge-5.1
timestamp: Wed 2014-03-12 18:43:44 +0200
message:
  merge 5.1->5.2
modified:
  sql/item.h                     sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
-------------- next part --------------
=== modified file 'sql/item.h'
--- a/sql/item.h	2012-08-24 10:32:46 +0000
+++ b/sql/item.h	2014-03-12 16:43:44 +0000
@@ -2980,7 +2980,7 @@ public:
 
   bool walk(Item_processor processor, bool walk_subquery, uchar *args)
   {
-    return arg->walk(processor, walk_subquery, args) ||
+    return (arg && arg->walk(processor, walk_subquery, args)) ||
       (this->*processor)(args);
   }
 



More information about the commits mailing list