1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compilation error

Browse Source 
extended initializers are only allowed since c++11
This commit is contained in:
Sergei Golubchik 2022-10-01 16:11:13 +02:00
parent f65ba9aeb7
commit fa6d7e4e98
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

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

3
sql/sql_trigger.cc
View File

@ -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))