merge 5.1->5.2

627005d8 · unknown · 48445f35 · cd29dc98 · 627005d8
Commit 627005d8 authored Mar 12, 2014 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item.h sql/item.h +1 -1

No files found.
--- a/sql/item.h
+++ b/sql/item.h
@@ -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);
  }