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

Merge 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2024-03-28 10:51:36 +02:00
parent 62243c444f a79fb66a98
commit fec2fd6add
490 changed files with 14843 additions and 4704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_show.cc
View File

@@ -2806,9 +2806,10 @@ static my_bool list_callback(THD *tmp, list_callback_arg *arg)
thd_info->thread_id=tmp->thread_id;
thd_info->os_thread_id=tmp->os_thread_id;
thd_info->user= arg->thd->strdup(tmp_sctx->user ? tmp_sctx->user :
(tmp->system_thread ?
"system user" : "unauthenticated user"));
thd_info->user= arg->thd->strdup(tmp_sctx->user && tmp_sctx->user != slave_user ?
tmp_sctx->user :
(tmp->system_thread ?
"system user" : "unauthenticated user"));
if (tmp->peer_port && (tmp_sctx->host || tmp_sctx->ip) &&
arg->thd->security_ctx->host_or_ip[0])
{
@@ -3311,7 +3312,7 @@ static my_bool processlist_callback(THD *tmp, processlist_callback_arg *arg)
/* ID */
arg->table->field[0]->store((longlong) tmp->thread_id, TRUE);
/* USER */
val= tmp_sctx->user ? tmp_sctx->user :
val= tmp_sctx->user && tmp_sctx->user != slave_user ? tmp_sctx->user :
(tmp->system_thread ? "system user" : "unauthenticated user");
arg->table->field[1]->store(val, strlen(val), cs);
/* HOST */