diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
commit | ffc69dbd05d31f016f3ac53be9d878ce133e60d6 (patch) | |
tree | 056faecdd7c90011e5729943725cd038019bc683 /sql/item.h | |
parent | dbc0d576a3f402ae52423fe424ed0a68f49537ef (diff) | |
parent | ac4934535daadba0a45ffa407a7643ca3ff2712a (diff) | |
download | mariadb-git-ffc69dbd05d31f016f3ac53be9d878ce133e60d6.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 883cc791f38..d61667f3f2f 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1208,6 +1208,13 @@ public: } virtual String *val_nodeset(String*) { return 0; } + bool eval_const_cond() + { + DBUG_ASSERT(const_item()); + DBUG_ASSERT(!is_expensive()); + return val_bool(); + } + /* save_val() is method of val_* family which stores value in the given field. |