diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
| commit | 5c3ff5cb93f8363820d506cdad3daafbc944f03b (patch) | |
| tree | f5671e95dabd8ced0c7925e54b351bd704e41bcf /sql/item_vers.cc | |
| parent | f9ab7b473a935141f85d27994d0faf3433a73144 (diff) | |
| parent | 7b42d892de6acc04490f5cb6b8355c72b8f1a406 (diff) | |
| download | mariadb-git-5c3ff5cb93f8363820d506cdad3daafbc944f03b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_vers.cc')
| -rw-r--r-- | sql/item_vers.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_vers.cc b/sql/item_vers.cc index c4bb734096f..c8f1c793895 100644 --- a/sql/item_vers.cc +++ b/sql/item_vers.cc @@ -61,10 +61,7 @@ Item_func_trt_ts::get_date(THD *thd, MYSQL_TIME *res, date_mode_t fuzzydate) null_value= !trt.query(trx_id); if (null_value) - { - my_error(ER_VERS_NO_TRX_ID, MYF(0), (longlong) trx_id); return true; - } return trt[trt_field]->get_date(res, fuzzydate); } |