summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-03-15 13:30:46 +1100
committerDaniel Black <daniel@mariadb.org>2022-03-16 09:37:45 +1100
commit57dbe8785d14a4b9e5b9dc17625cd00f615e136d (patch)
tree8a389cc968dec4478570c219a5958edfa59c977a /sql/sql_parse.cc
parent99837c61a6efd27a270c45bd055fac110d1a6947 (diff)
downloadmariadb-git-57dbe8785d14a4b9e5b9dc17625cd00f615e136d.tar.gz
MDEV-23915 ER_KILL_DENIED_ERROR not passed a thread id (part 2)
Per Marko's comment in JIRA, sql_kill is passing the thread id as long long. We change the format of the error messages to match, and cast the thread id to long long in sql_kill_user.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a9d928f2c2a..989ca0c8803 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -9123,7 +9123,7 @@ void sql_kill_user(THD *thd, LEX_USER *user, killed_state state)
my_ok(thd, rows);
break;
case ER_KILL_DENIED_ERROR:
- my_error(error, MYF(0), (unsigned long) thd->thread_id);
+ my_error(error, MYF(0), (long long) thd->thread_id);
break;
case ER_OUT_OF_RESOURCES:
default: