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

Merged recent change from mysql-5.5-bugteam into

mysql-5.5-runtime tree.
This commit is contained in:
Dmitry Lenev
2010-11-19 10:46:50 +03:00
2 changed files with 6 additions and 6 deletions

View File

@ -1525,13 +1525,13 @@ SET NAMES latin1;
SELECT GET_LOCK('t',1000) AS 'óóóó';; SELECT GET_LOCK('t',1000) AS 'óóóó';;
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info Id User Host db Command Time State Info
### root localhost test Query ### ### SHOW PROCESSLIST ### root ### test Query ### ### SHOW PROCESSLIST
### root localhost test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
SET NAMES utf8; SET NAMES utf8;
SHOW PROCESSLIST; SHOW PROCESSLIST;
Id User Host db Command Time State Info Id User Host db Command Time State Info
### root localhost test Query ### ### SHOW PROCESSLIST ### root ### test Query ### ### SHOW PROCESSLIST
### root localhost test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó' ### root ### test Query ### ### SELECT GET_LOCK('t',1000) AS 'óóóó'
SELECT RELEASE_LOCK('t'); SELECT RELEASE_LOCK('t');
RELEASE_LOCK('t') RELEASE_LOCK('t')
1 1

View File

@ -1343,10 +1343,10 @@ SET NAMES latin1;
let $wait_timeout= 10; let $wait_timeout= 10;
let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID(); let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID();
--source include/wait_condition.inc --source include/wait_condition.inc
--replace_column 1 ### 6 ### 7 ### --replace_column 1 ### 3 ### 6 ### 7 ###
SHOW PROCESSLIST; SHOW PROCESSLIST;
SET NAMES utf8; SET NAMES utf8;
--replace_column 1 ### 6 ### 7 ### --replace_column 1 ### 3 ### 6 ### 7 ###
SHOW PROCESSLIST; SHOW PROCESSLIST;
SELECT RELEASE_LOCK('t'); SELECT RELEASE_LOCK('t');
--connection con1 --connection con1