From fa6d7e4e9897cd80dfddb855f4336fca4d002dcc Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 1 Oct 2022 16:11:13 +0200 Subject: [PATCH] compilation error extended initializers are only allowed since c++11 --- sql/sql_class.cc | 2 +- sql/sql_trigger.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 043fb6f24d8..7afefa76d8b 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -3879,9 +3879,9 @@ Statement::Statement(LEX *lex_arg, MEM_ROOT *mem_root_arg, id(id_arg), column_usage(MARK_COLUMNS_READ), lex(lex_arg), - hr_prepare_time({0}), db(null_clex_str) { + hr_prepare_time.val= 0, name= null_clex_str; } diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 375b2e12d65..f01efd84528 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1482,8 +1482,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const LEX_CSTRING *db, trigger->sql_mode= sql_mode; trigger->definition= *trg_create_str; - trigger->hr_create_time= - my_hrtime_t({trg_create_time ? *trg_create_time : 0}); + trigger->hr_create_time.val= trg_create_time ? *trg_create_time : 0; /* Fix time if in 100th of second (comparison with max uint * 100 (max possible timestamp in the old format))