Skip to content

Commit 57dbe87

Browse files
committed
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.
1 parent 99837c6 commit 57dbe87

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

sql/share/errmsg-utf8.txt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,30 +2231,30 @@ ER_NO_SUCH_THREAD
22312231
swe "Finns ingen tråd med id %lu"
22322232
ukr "Невідомий ідентифікатор гілки: %lu"
22332233
ER_KILL_DENIED_ERROR
2234-
cze "Nejste vlastníkem threadu %lu"
2235-
dan "Du er ikke ejer af tråden %lu"
2236-
nla "U bent geen bezitter van thread %lu"
2237-
eng "You are not owner of thread %lu"
2238-
est "Ei ole lõime %lu omanik"
2239-
fre "Vous n'êtes pas propriétaire de la tâche no: %lu"
2240-
ger "Sie sind nicht Eigentümer von Thread %lu"
2241-
greek "Δεν είσθε owner του thread %lu"
2242-
hindi "आप थ्रेड %lu के OWNER नहीं हैं"
2243-
hun "A %lu thread-nek mas a tulajdonosa"
2244-
ita "Utente non proprietario del thread %lu"
2245-
jpn "スレッド %lu のオーナーではありません。"
2246-
kor "쓰레드(Thread) %lu의 소유자가 아닙니다."
2247-
nor "Du er ikke eier av tråden %lu"
2248-
norwegian-ny "Du er ikkje eigar av tråd %lu"
2249-
pol "Nie jeste? wła?cicielem w?tku %lu"
2250-
por "Você não é proprietário da 'thread' %lu"
2251-
rum "Nu sinteti proprietarul threadului %lu"
2252-
rus "Вы не являетесь владельцем потока %lu"
2253-
serbian "Vi niste vlasnik thread-a %lu"
2254-
slo "Nie ste vlastníkom vlákna %lu"
2255-
spa "Tu no eres el propietario del thread%lu"
2256-
swe "Du är inte ägare till tråd %lu"
2257-
ukr "Ви не володар гілки %lu"
2234+
cze "Nejste vlastníkem threadu %lld"
2235+
dan "Du er ikke ejer af tråden %lld"
2236+
nla "U bent geen bezitter van thread %lld"
2237+
eng "You are not owner of thread %lld"
2238+
est "Ei ole lõime %lld omanik"
2239+
fre "Vous n'êtes pas propriétaire de la tâche no: %lld"
2240+
ger "Sie sind nicht Eigentümer von Thread %lld"
2241+
greek "Δεν είσθε owner του thread %lld"
2242+
hindi "आप थ्रेड %lld के OWNER नहीं हैं"
2243+
hun "A %lld thread-nek mas a tulajdonosa"
2244+
ita "Utente non proprietario del thread %lld"
2245+
jpn "スレッド %lld のオーナーではありません。"
2246+
kor "쓰레드(Thread) %lld의 소유자가 아닙니다."
2247+
nor "Du er ikke eier av tråden %lld"
2248+
norwegian-ny "Du er ikkje eigar av tråd %lld"
2249+
pol "Nie jeste? wła?cicielem w?tku %lld"
2250+
por "Você não é proprietário da 'thread' %lld"
2251+
rum "Nu sinteti proprietarul threadului %lld"
2252+
rus "Вы не являетесь владельцем потока %lld"
2253+
serbian "Vi niste vlasnik thread-a %lld"
2254+
slo "Nie ste vlastníkom vlákna %lld"
2255+
spa "Tu no eres el propietario del thread%lld"
2256+
swe "Du är inte ägare till tråd %lld"
2257+
ukr "Ви не володар гілки %lld"
22582258
ER_NO_TABLES_USED
22592259
cze "Nejsou použity žádné tabulky"
22602260
dan "Ingen tabeller i brug"

sql/sql_parse.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9123,7 +9123,7 @@ void sql_kill_user(THD *thd, LEX_USER *user, killed_state state)
91239123
my_ok(thd, rows);
91249124
break;
91259125
case ER_KILL_DENIED_ERROR:
9126-
my_error(error, MYF(0), (unsigned long) thd->thread_id);
9126+
my_error(error, MYF(0), (long long) thd->thread_id);
91279127
break;
91289128
case ER_OUT_OF_RESOURCES:
91299129
default:

0 commit comments

Comments
 (0)