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

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-06-21 23:47:39 +02:00
parent fe3f9fa918 c09a8b5b36
commit b942aa34c1
185 changed files with 2884 additions and 1966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/plugins/r/processlist.result Normal file
View File

@ -0,0 +1,11 @@
create table t1 (a int) engine=innodb;
start transaction;
insert t1 values (1);
connect con2,localhost,root;
state from show engine innodb status
state from show processlist
disconnect con2;
connection default;
drop table t1;

18
mysql-test/suite/plugins/t/processlist.test Normal file
View File

@ -0,0 +1,18 @@
#
# MDEV-15359 Thread stay in "cleaning up" status after finishing
#
source include/have_innodb.inc;
create table t1 (a int) engine=innodb;
start transaction;
insert t1 values (1);
let id=`select connection_id()`;
connect con2,localhost,root;
let s=query_get_value(show engine innodb status,Status,1);
disable_query_log;
eval select regexp_replace("$s", '(?s)^.*MySQL thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status`;
eval select state as `state from show processlist` from information_schema.processlist where id = $id;
enable_query_log;
disconnect con2;
connection default;
drop table t1;