Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
df2c54f2
Commit
df2c54f2
authored
14 years ago
by
Dmitry Lenev
Browse files
Options
Browse Files
Download
Plain Diff
Merged recent change from mysql-5.5-bugteam into
mysql-5.5-runtime tree.
parents
ce16c4fb
ee66d905
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
mysql-test/r/show_check.result
mysql-test/r/show_check.result
+4
-4
mysql-test/t/show_check.test
mysql-test/t/show_check.test
+2
-2
No files found.
mysql-test/r/show_check.result
View file @
df2c54f2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/show_check.test
View file @
df2c54f2
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment