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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f1204a64
Commit
f1204a64
authored
Jun 06, 2011
by
Michael Widenius
Browse files
Options
Browse Files
Download
Plain Diff
Merge with 5.2 to get bug fixes for thr_lock
parents
13520823
ea22ad95
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
106 additions
and
43 deletions
+106
-43
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-1
mysql-test/r/lock.result
mysql-test/r/lock.result
+10
-0
mysql-test/t/lock.test
mysql-test/t/lock.test
+25
-0
mysys/thr_lock.c
mysys/thr_lock.c
+70
-42
No files found.
mysql-test/mysql-test-run.pl
View file @
f1204a64
...
...
@@ -4397,7 +4397,7 @@ sub extract_warning_lines ($$) {
my
@patterns
=
(
qr/^Warning
:
|mysqld: Warning|\[Warning\]/
,
qr/^Warning|mysqld: Warning|\[Warning\]/
,
qr/^Error:|\[ERROR\]/
,
qr/^==\d+==\s+\S/
,
# valgrind errors
qr/InnoDB: Warning|InnoDB: Error/
,
...
...
mysql-test/r/lock.result
View file @
f1204a64
...
...
@@ -194,3 +194,13 @@ ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
UNLOCK TABLES;
DROP TABLE t1,t2;
End of 5.1 tests.
create table t1 (a int) engine=myisam;
lock tables t1 write concurrent, t1 as t2 read;
lock tables t1 read local;
unlock tables;
unlock tables;
lock tables t1 read local;
lock tables t1 write concurrent, t1 as t2 read;
unlock tables;
unlock tables;
drop table t1;
mysql-test/t/lock.test
View file @
f1204a64
...
...
@@ -245,3 +245,28 @@ UNLOCK TABLES;
DROP
TABLE
t1
,
t2
;
--
echo
End
of
5.1
tests
.
#
# Test concurrent lock and read locks
# This gave a warning:
# Warning at 'read lock with old write lock' for lock: 5:
# Found lock of type 8 that is write and read locked. Read_no_write_count: 1
#
create
table
t1
(
a
int
)
engine
=
myisam
;
lock
tables
t1
write
concurrent
,
t1
as
t2
read
;
connect
(
con1
,
localhost
,
root
,,);
connection
con1
;
lock
tables
t1
read
local
;
unlock
tables
;
connection
default
;
unlock
tables
;
connection
con1
;
lock
tables
t1
read
local
;
connection
default
;
lock
tables
t1
write
concurrent
,
t1
as
t2
read
;
unlock
tables
;
connection
con1
;
unlock
tables
;
disconnect
con1
;
connection
default
;
drop
table
t1
;
mysys/thr_lock.c
View file @
f1204a64
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