summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <sanja@montyprogram.com>2014-03-12 12:34:16 +0200
committerunknown <sanja@montyprogram.com>2014-03-12 12:34:16 +0200
commitd8ea8a3d13d2a754a1e80d11619ba3347bb7ee5f (patch)
tree9193a054130181e04ebb970402de348f7a380a54 /sql/item.h
parent321ff25f3d419bc1a1fae2390450d1b4db30b64c (diff)
downloadmariadb-git-d8ea8a3d13d2a754a1e80d11619ba3347bb7ee5f.tar.gz
MDEV-5717: Server crash with insert statement containing DEFAULT into view
Item_default_value::arg can be NULL so walk() should take it into consideration.
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h
index 80f8ef966bb..e8619ca4f92 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -3551,7 +3551,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);
}