database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Code Activity

Merge 10.11 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2025-09-24 13:40:09 +03:00
parent d098e61542 990b44495c
commit e8ef8c0055
66 changed files with 1171 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.cc
View File

@@ -1875,7 +1875,7 @@ dispatch_command_return dispatch_command(enum enum_server_command command, THD *
(char *) thd->security_ctx->host_or_ip);
char *packet_end= thd->query() + thd->query_length();
general_log_write(thd, command, thd->query(), thd->query_length());
DBUG_PRINT("query",("%-.4096s",thd->query()));
DBUG_PRINT("query",("query_id=%lld, %.*s", thd->query_id, thd->query_length(), thd->query()));
#if defined(ENABLED_PROFILING)
thd->profiling.set_query_source(thd->query(), thd->query_length());
#endif
@@ -8153,8 +8153,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
}
}
}
/* Store the table reference preceding the current one. */
TABLE_LIST *UNINIT_VAR(previous_table_ref); /* The table preceding the current one. */
/* Store the table reference preceding the current in previous_table_ref */
TABLE_LIST *UNINIT_VAR(previous_table_ref);
if (table_list.elements > 0 && likely(!ptr->sequence))
{
/*