diff options
| author | Dmitry Lenev <Dmitry.Lenev@oracle.com> | 2010-11-19 10:46:50 +0300 |
|---|---|---|
| committer | Dmitry Lenev <Dmitry.Lenev@oracle.com> | 2010-11-19 10:46:50 +0300 |
| commit | df2c54f2b26e60e06fe83cbb07f1bc5a02883f9c (patch) | |
| tree | a129a302224e616142b7dffa9956727b665ecda8 | |
| parent | ce16c4fb3c29778a651b5e041a5e74f43ca42182 (diff) | |
| parent | ee66d905f2c8383cbea3710cf15ab6bb2cf43d7a (diff) | |
| download | mariadb-git-df2c54f2b26e60e06fe83cbb07f1bc5a02883f9c.tar.gz | |
Merged recent change from mysql-5.5-bugteam into
mysql-5.5-runtime tree.
| -rw-r--r-- | mysql-test/r/show_check.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/show_check.test | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index d2be40834b6..5e41e6b29c6 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -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 diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index 060022dee64..fc3cfc76939 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -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 |