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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2020-11-02 12:49:19 +02:00
parent e6f95b23f4 440d4b282d
commit 09a1f0075a
627 changed files with 34558 additions and 13768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysqld/lib_sql.cc
View File

@ -332,7 +332,7 @@ static my_bool emb_read_query_result(MYSQL *mysql)
static int emb_stmt_execute(MYSQL_STMT *stmt)
{
DBUG_ENTER("emb_stmt_execute");
uchar header[5];
uchar header[9];
THD *thd;
my_bool res;
@ -344,6 +344,7 @@ static int emb_stmt_execute(MYSQL_STMT *stmt)
int4store(header, stmt->stmt_id);
header[4]= (uchar) stmt->flags;
header[5]= header[6]= header[7]= header[8]= 0; // safety
thd= (THD*)stmt->mysql->thd;
thd->client_param_count= stmt->param_count;
thd->client_params= stmt->params;