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

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-10-04 07:41:35 +02:00
parent 7d4b2b9847 fe449affcf
commit b6ebadaa66
344 changed files with 13374 additions and 5521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_prepare.cc
View File

@ -4505,6 +4505,8 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
if (thd->spcont == NULL)
general_log_write(thd, COM_STMT_PREPARE, query(), query_length());
}
// The same format as for triggers to compare
hr_prepare_time= my_hrtime();
DBUG_RETURN(error);
}
@ -4598,8 +4600,8 @@ Prepared_statement::execute_loop(String *expanded_query,
uchar *packet_end)
{
Reprepare_observer reprepare_observer;
bool error;
int reprepare_attempt= 0;
bool error;
iterations= FALSE;
/*