diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 11:33:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 11:33:53 +0200 |
| commit | b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9 (patch) | |
| tree | b0ce48cd6f43a11d7465312dfe14552a8e4f8e3b /sql/item.h | |
| parent | 375256bae71e3f20d4498990610842b2976b6187 (diff) | |
| parent | 45531949ae115f2ba7b9450cc2386653483211ba (diff) | |
| download | mariadb-git-b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 9c53f731f6e..4f73230bfdd 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1501,6 +1501,7 @@ public: virtual const char *full_name() const { return name.str ? name.str : "???"; } const char *field_name_or_null() { return real_item()->type() == Item::FIELD_ITEM ? name.str : NULL; } + const TABLE_SHARE *field_table_or_null(); /* *result* family of methods is analog of *val* family (see above) but @@ -6802,7 +6803,8 @@ public: my_decimal *val_decimal(my_decimal *); bool get_date(THD *thd, MYSQL_TIME *to, date_mode_t mode) { - return decimal_to_datetime_with_warn(thd, VDec(this).ptr(), to, mode, NULL); + return decimal_to_datetime_with_warn(thd, VDec(this).ptr(), to, mode, + NULL, NULL); } bool cache_value(); Item *convert_to_basic_const_item(THD *thd); |