diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-18 16:01:58 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-11-18 16:01:58 +0100 |
| commit | 2215dc3cc1bc8858761d6366436cc4c1f697b1ed (patch) | |
| tree | 7cc348d24f298fedc96ce3eef04478cb467d360f /sql/item.h | |
| parent | a6f40e50719134a6489095b01ac9e41fc8af767d (diff) | |
| parent | e0a17f56988d2c0d44a8c2107588b352f6dec07a (diff) | |
| download | mariadb-git-2215dc3cc1bc8858761d6366436cc4c1f697b1ed.tar.gz | |
Merge from mysql-5.5-runtime to mysql-5.5-bugteam
No conflicts
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 8e8199ecac8..e65bacf4cb7 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2572,7 +2572,7 @@ public: DBUG_ASSERT(fixed); return (*ref)->get_time(ltime); } - virtual bool basic_const_item() const { return (*ref)->basic_const_item(); } + virtual bool basic_const_item() const { return ref && (*ref)->basic_const_item(); } bool is_outer_field() const { DBUG_ASSERT(fixed); |