Commit df2c54f2 authored by Dmitry Lenev's avatar Dmitry Lenev

Merged recent change from mysql-5.5-bugteam into

mysql-5.5-runtime tree.
parents ce16c4fb ee66d905
No related merge requests found
......@@ -1525,13 +1525,13 @@ SET NAMES latin1;
SELECT GET_LOCK('t',1000) AS 'óóóó';;
SHOW PROCESSLIST;
Id User Host db Command Time State Info
### root localhost test Query ### ### SHOW PROCESSLIST
### root localhost test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
### root ### test Query ### ### SHOW PROCESSLIST
### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
SET NAMES utf8;
SHOW PROCESSLIST;
Id User Host db Command Time State Info
### root localhost test Query ### ### SHOW PROCESSLIST
### root localhost test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
### root ### test Query ### ### SHOW PROCESSLIST
### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
SELECT RELEASE_LOCK('t');
RELEASE_LOCK('t')
1
......
......@@ -1343,10 +1343,10 @@ SET NAMES latin1;
let $wait_timeout= 10;
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID();
--source include/wait_condition.inc
--replace_column 1 ### 6 ### 7 ###
--replace_column 1 ### 3 ### 6 ### 7 ###
SHOW PROCESSLIST;
SET NAMES utf8;
--replace_column 1 ### 6 ### 7 ###
--replace_column 1 ### 3 ### 6 ### 7 ###
SHOW PROCESSLIST;
SELECT RELEASE_LOCK('t');
--connection con1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment