diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-31 13:51:28 +0300 |
commit | 66ec3a770f7854f500ece66c78f3c87c9cd6da15 (patch) | |
tree | 0777df9a8dc587b70851c1edc0cfe96895928717 /sql/item_create.cc | |
parent | 6053eb1ce278ac1f566cd74498506bf457d6d048 (diff) | |
parent | f35d1721039f8f115fc55e8f4b4d2bb4012161d1 (diff) | |
download | mariadb-git-66ec3a770f7854f500ece66c78f3c87c9cd6da15.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r-- | sql/item_create.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index 503165e69df..eb361b8222f 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -7533,7 +7533,7 @@ Item *create_temporal_literal(THD *thd, ErrConvString err(str, length, cs); make_truncated_value_warning(thd, Sql_condition::time_warn_level(status.warnings), - &err, ltime.time_type, 0, 0); + &err, ltime.time_type, NULL, NULL, NULL); } return item; } |