diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 10:34:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 10:34:38 +0200 |
| commit | 99a433ed1cc2cebad93d6ece2b65691f2f49d3ea (patch) | |
| tree | e7fc16ab8fe9b4b9ff486d1adbc27ed84c72b923 /sql/item.h | |
| parent | 0a1d9d0681fda7595c0d08038357b56cf3bea9eb (diff) | |
| parent | b2187662bcba12b66667bc0531727453b3b8a666 (diff) | |
| download | mariadb-git-99a433ed1cc2cebad93d6ece2b65691f2f49d3ea.tar.gz | |
Merge branch '10.6' into 10.7mariadb-10.7.4
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index f6c123e79d4..c3251259b43 100644 --- a/sql/item.h +++ b/sql/item.h @@ -6648,9 +6648,9 @@ public: bool get_date(THD *thd, MYSQL_TIME *ltime,date_mode_t fuzzydate) override; bool val_native(THD *thd, Native *to) override; bool val_native_result(THD *thd, Native *to) override; - longlong val_datetime_packed(THD *thd) + longlong val_datetime_packed(THD *thd) override { return Item::val_datetime_packed(thd); } - longlong val_time_packed(THD *thd) + longlong val_time_packed(THD *thd) override { return Item::val_time_packed(thd); } /* Result variants */ |