diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
| commit | f84e28c119b495da77e197f7cd18af4048fc3126 (patch) | |
| tree | 5957008a7725e23cc6331b1251ff5d3f6b725076 /sql/sql_class.cc | |
| parent | ac2857a5fbf851d90171ac55f23385869ee6ba83 (diff) | |
| parent | e4901d9523ab838ea13bb0278980f8707aa2c581 (diff) | |
| download | mariadb-git-f84e28c119b495da77e197f7cd18af4048fc3126.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 3040aeba4ba..28bf77c94e8 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -5228,8 +5228,8 @@ extern "C" bool thd_is_strict_mode(const MYSQL_THD thd) */ void thd_get_query_start_data(THD *thd, char *buf) { - LEX_CSTRING field_name; - Field_timestampf f((uchar *)buf, NULL, 0, Field::NONE, &field_name, NULL, 6); + Field_timestampf f((uchar *)buf, nullptr, 0, Field::NONE, &empty_clex_str, + nullptr, 6); f.store_TIME(thd->query_start(), thd->query_start_sec_part()); } |