database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.2 to 10.3

Browse Source
This commit is contained in:
Daniel Black
2022-03-16 12:51:22 +11:00
parent 0e63023cb8 57dbe8785d
commit 6a2d88c132
4 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/galera/r/galera_kill_applier.result
View File

@ -1,8 +1,12 @@
connection node_2; connection node_2;
SET GLOBAL wsrep_slave_threads=2; SET GLOBAL wsrep_slave_threads=2;
KILL ID;
Got one of the listed errors Got one of the listed errors
KILL QUERY ID;
Got one of the listed errors Got one of the listed errors
KILL ID;
Got one of the listed errors Got one of the listed errors
KILL QUERY ID;
Got one of the listed errors Got one of the listed errors
SET GLOBAL wsrep_slave_threads=1; SET GLOBAL wsrep_slave_threads=1;
connection node_1; connection node_1;

6
mysql-test/suite/galera/t/galera_kill_applier.test
View File

@ -15,21 +15,23 @@ SET GLOBAL wsrep_slave_threads=2;
--let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep applier idle' LIMIT 1` --let $applier_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep applier idle' LIMIT 1`
--disable_query_log --replace_result $applier_thread ID
--error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
--eval KILL $applier_thread --eval KILL $applier_thread
--replace_result $applier_thread ID
--error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
--eval KILL QUERY $applier_thread --eval KILL QUERY $applier_thread
--let $aborter_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep aborter idle' LIMIT 1` --let $aborter_thread = `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'wsrep aborter idle' LIMIT 1`
--replace_result $aborter_thread ID
--error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
--eval KILL $aborter_thread --eval KILL $aborter_thread
--replace_result $aborter_thread ID
--error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR --error ER_KILL_DENIED_ERROR,ER_KILL_DENIED_ERROR
--eval KILL QUERY $aborter_thread --eval KILL QUERY $aborter_thread
--enable_query_log
SET GLOBAL wsrep_slave_threads=1; SET GLOBAL wsrep_slave_threads=1;

48
sql/share/errmsg-utf8.txt
View File

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

18
sql/sql_parse.cc
View File

@ -9205,15 +9205,17 @@ void sql_kill_user(THD *thd, LEX_USER *user, killed_state state)
WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL) WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL)
} }
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
if (likely(!(error= kill_threads_for_user(thd, user, state, &rows)))) switch (error= kill_threads_for_user(thd, user, state, &rows))
my_ok(thd, rows);
else
{ {
/* case 0:
This is probably ER_OUT_OF_RESOURCES, but in the future we may my_ok(thd, rows);
want to write the name of the user we tried to kill break;
*/ case ER_KILL_DENIED_ERROR:
my_error(error, MYF(0), user->host.str, user->user.str); my_error(error, MYF(0), (long long) thd->thread_id);
break;
case ER_OUT_OF_RESOURCES:
default:
my_error(error, MYF(0));
} }
#ifdef WITH_WSREP #ifdef WITH_WSREP
return; return;