database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2022-10-02 22:14:21 +02:00
parent 2ab52cc0e5 3a2116241b
commit 900d7bf360
245 changed files with 9723 additions and 2458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -3955,6 +3955,7 @@ Statement::Statement(LEX *lex_arg, MEM_ROOT *mem_root_arg,
lex(lex_arg),
db(null_clex_str)
{
hr_prepare_time.val= 0,
name= null_clex_str;
}
@ -3971,6 +3972,7 @@ void Statement::set_statement(Statement *stmt)
column_usage= stmt->column_usage;
lex= stmt->lex;
query_string= stmt->query_string;
hr_prepare_time= stmt->hr_prepare_time;
}