database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2021-08-18 16:51:52 +03:00
parent ac2857a5fb e4901d9523
commit f84e28c119
73 changed files with 1277 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@@ -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());
}