Skip to content

Commit

Permalink
MDEV-23915 ER_KILL_DENIED_ERROR not passed a thread id (part 2)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
grooverdan committed Mar 15, 2022
1 parent 99837c6 commit 57dbe87
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
48 changes: 24 additions & 24 deletions sql/share/errmsg-utf8.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2231,30 +2231,30 @@ ER_NO_SUCH_THREAD
swe "Finns ingen tråd med id %lu"
ukr "Невідомий ідентифікатор гілки: %lu"
ER_KILL_DENIED_ERROR
cze "Nejste vlastníkem threadu %lu"
dan "Du er ikke ejer af tråden %lu"
nla "U bent geen bezitter van thread %lu"
eng "You are not owner of thread %lu"
est "Ei ole lõime %lu omanik"
fre "Vous n'êtes pas propriétaire de la tâche no: %lu"
ger "Sie sind nicht Eigentümer von Thread %lu"
greek "Δεν είσθε owner του thread %lu"
hindi "आप थ्रेड %lu के OWNER नहीं हैं"
hun "A %lu thread-nek mas a tulajdonosa"
ita "Utente non proprietario del thread %lu"
jpn "スレッド %lu のオーナーではありません。"
kor "쓰레드(Thread) %lu의 소유자가 아닙니다."
nor "Du er ikke eier av tråden %lu"
norwegian-ny "Du er ikkje eigar av tråd %lu"
pol "Nie jeste? wła?cicielem w?tku %lu"
por "Você não é proprietário da 'thread' %lu"
rum "Nu sinteti proprietarul threadului %lu"
rus "Вы не являетесь владельцем потока %lu"
serbian "Vi niste vlasnik thread-a %lu"
slo "Nie ste vlastníkom vlákna %lu"
spa "Tu no eres el propietario del thread%lu"
swe "Du är inte ägare till tråd %lu"
ukr "Ви не володар гілки %lu"
cze "Nejste vlastníkem threadu %lld"
dan "Du er ikke ejer af tråden %lld"
nla "U bent geen bezitter van thread %lld"
eng "You are not owner of thread %lld"
est "Ei ole lõime %lld omanik"
fre "Vous n'êtes pas propriétaire de la tâche no: %lld"
ger "Sie sind nicht Eigentümer von Thread %lld"
greek "Δεν είσθε owner του thread %lld"
hindi "आप थ्रेड %lld के OWNER नहीं हैं"
hun "A %lld thread-nek mas a tulajdonosa"
ita "Utente non proprietario del thread %lld"
jpn "スレッド %lld のオーナーではありません。"
kor "쓰레드(Thread) %lld의 소유자가 아닙니다."
nor "Du er ikke eier av tråden %lld"
norwegian-ny "Du er ikkje eigar av tråd %lld"
pol "Nie jeste? wła?cicielem w?tku %lld"
por "Você não é proprietário da 'thread' %lld"
rum "Nu sinteti proprietarul threadului %lld"
rus "Вы не являетесь владельцем потока %lld"
serbian "Vi niste vlasnik thread-a %lld"
slo "Nie ste vlastníkom vlákna %lld"
spa "Tu no eres el propietario del thread%lld"
swe "Du är inte ägare till tråd %lld"
ukr "Ви не володар гілки %lld"
ER_NO_TABLES_USED
cze "Nejsou použity žádné tabulky"
dan "Ingen tabeller i brug"
Expand Down
2 changes: 1 addition & 1 deletion sql/sql_parse.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 57dbe87

Please sign in to comment.