database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2018-06-30 16:39:20 +02:00
parent 7c0779da7c 1dd3c8f8ba
commit 36e59752e7
273 changed files with 4467 additions and 1284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/plugins/r/auth_ed25519.result
View File

@@ -32,7 +32,7 @@ PLUGIN_AUTHOR Sergei Golubchik
PLUGIN_DESCRIPTION Elliptic curve ED25519 based authentication
PLUGIN_LICENSE GPL
LOAD_OPTION ON
PLUGIN_MATURITY Beta
PLUGIN_MATURITY Stable
PLUGIN_AUTH_VERSION 1.0-alpha
create user test1@localhost identified via ed25519 using 'ZIgUREUg5PVgQ6LskhXmO+eZLS0nC8be6HPjYWR4YJY';
show grants for test1@localhost;

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

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

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

@@ -0,0 +1,20 @@
#
# 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 $wait_condition=select state='' from information_schema.processlist where id = $id;
--source include/wait_condition.inc
replace_regex /\"/-/; #"
let s=`show engine innodb status`;
disable_query_log;
eval select regexp_replace("$s", '(?s)^.*MySQL thread id $id,.*root([^\n]*)\n.*', '\\\\1') as `state from show engine innodb status, must be empty`;
enable_query_log;
disconnect con2;
connection default;
drop table t1;