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.11' into 11.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-29 16:39:47 +01:00
parent 52723ec09a 3d0fb15028
commit 69d033d165
660 changed files with 8148 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_prepare.cc
View File

@ -1536,8 +1536,8 @@ static bool mysql_test_do_fields(Prepared_statement *stmt,
if (open_normal_and_derived_tables(thd, tables, MYSQL_OPEN_FORCE_SHARED_MDL,
DT_INIT | DT_PREPARE))
DBUG_RETURN(TRUE);
DBUG_RETURN(setup_fields(thd, Ref_ptr_array(),
*values, COLUMNS_READ, 0, NULL, 0));
DBUG_RETURN(setup_fields(thd, Ref_ptr_array(), *values, COLUMNS_READ, 0,
NULL, 0, THD_WHERE::DO_STATEMENT));
}
@ -1569,6 +1569,7 @@ static bool mysql_test_set_fields(Prepared_statement *stmt,
DT_INIT | DT_PREPARE))
goto error;
thd->where= THD_WHERE::SET_LIST;
while ((var= it++))
{
if (var->light_check(thd))
@ -6103,7 +6104,7 @@ loc_advanced_command(MYSQL *mysql, enum enum_server_command command,
{
THD *thd_orig= current_thd;
set_current_thd(p->thd);
p->thd->thread_stack= (char*) &result;
p->thd->thread_stack= (void*) &result; // Big stack
p->thd->set_time();
result= execute_server_code(p->thd, (const char *)arg, arg_length);
p->thd->cleanup_after_query();
@ -6283,7 +6284,6 @@ extern "C" MYSQL *mysql_real_connect_local(MYSQL *mysql)
new_thd= new THD(0);
local_connection_thread_count++;
new_thd->thread_stack= (char*) &thd_orig;
new_thd->store_globals();
new_thd->security_ctx->skip_grants();
new_thd->query_cache_is_applicable= 0;