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
cebeda04
Commit
cebeda04
authored
Oct 14, 2013
by
Rich Prohaska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#128 fix some tokudb_lock_timeout tests that broke when we changed to a session variable
parent
20e2a4b6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
20 deletions
+28
-20
mysql-test/suite/tokudb/locks-blocking-row-locks-testgen.py
mysql-test/suite/tokudb/locks-blocking-row-locks-testgen.py
+4
-2
mysql-test/suite/tokudb/r/locks-blocking-row-locks-getset.result
...est/suite/tokudb/r/locks-blocking-row-locks-getset.result
+5
-5
mysql-test/suite/tokudb/r/locks-blocking-row-locks.result
mysql-test/suite/tokudb/r/locks-blocking-row-locks.result
+4
-3
mysql-test/suite/tokudb/t/locks-blocking-row-locks-getset.test
...-test/suite/tokudb/t/locks-blocking-row-locks-getset.test
+6
-6
mysql-test/suite/tokudb/t/locks-blocking-row-locks.test
mysql-test/suite/tokudb/t/locks-blocking-row-locks.test
+9
-4
No files found.
mysql-test/suite/tokudb/locks-blocking-row-locks-testgen.py
View file @
cebeda04
...
...
@@ -44,7 +44,6 @@ def mysqlgen_reload_table():
def
mysqlgen_cleanup
():
print
"# clean it all up"
print
"drop table t;"
print
"set global tokudb_lock_timeout=4000;"
print
""
write_point_queries
=
[
(
"select for update"
,
mysqlgen_select_for_update
),
...
...
@@ -65,7 +64,10 @@ mysqlgen_prepare()
mysqlgen_reload_table
()
for
timeout
in
timeouts
:
print
"# testing with timeout %s"
%
timeout
print
"set global tokudb_lock_timeout=%s;"
%
timeout
print
"connection conn1;"
print
"set session tokudb_lock_timeout=%s;"
%
timeout
print
"connection conn2;"
print
"set session tokudb_lock_timeout=%s;"
%
timeout
print
""
print
"# testing each point query vs each point query"
for
ta
,
qa
in
write_point_queries
:
...
...
mysql-test/suite/tokudb/r/locks-blocking-row-locks-getset.result
View file @
cebeda04
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
4000
set
global
tokudb_lock_timeout=1234567;
set
session
tokudb_lock_timeout=1234567;
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
1234567
set
global
tokudb_lock_timeout=0;
set
session
tokudb_lock_timeout=0;
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
0
set
global
tokudb_lock_timeout=5000000;
set
session
tokudb_lock_timeout=5000000;
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
5000000
set
global
tokudb_lock_timeout=1000000;
set
session
tokudb_lock_timeout=1000000;
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
1000000
set
global
tokudb_lock_timeout=4000;
set
session
tokudb_lock_timeout=4000;
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
4000
mysql-test/suite/tokudb/r/locks-blocking-row-locks.result
View file @
cebeda04
...
...
@@ -8,7 +8,8 @@ insert ignore t values(3, 9);
insert ignore t values(4, 16);
insert ignore t values(5, 25);
insert ignore t values(6, 36);
set global tokudb_lock_timeout=0;
set session tokudb_lock_timeout=0;
set session tokudb_lock_timeout=0;
begin;
select * from t where a=1 for update;
a b
...
...
@@ -1067,7 +1068,8 @@ a b
5 25
6 36
commit;
set global tokudb_lock_timeout=500;
set session tokudb_lock_timeout=500;
set session tokudb_lock_timeout=500;
begin;
select * from t where a=1 for update;
a b
...
...
@@ -2287,4 +2289,3 @@ update t set b=b where a>=2 and a<=4;
update t set b=b where a>=0 and a<=3;
commit;
drop table t;
set global tokudb_lock_timeout=4000;
mysql-test/suite/tokudb/t/locks-blocking-row-locks-getset.test
View file @
cebeda04
...
...
@@ -2,15 +2,15 @@
# Test that getting and setting the value for
# blocking row lock timeout works correctly.
# Make sure we can read/write the
global
lock timeout system variable
# Make sure we can read/write the
session
lock timeout system variable
select
@@
tokudb_lock_timeout
;
set
global
tokudb_lock_timeout
=
1234567
;
set
session
tokudb_lock_timeout
=
1234567
;
select
@@
tokudb_lock_timeout
;
set
global
tokudb_lock_timeout
=
0
;
set
session
tokudb_lock_timeout
=
0
;
select
@@
tokudb_lock_timeout
;
set
global
tokudb_lock_timeout
=
5000000
;
set
session
tokudb_lock_timeout
=
5000000
;
select
@@
tokudb_lock_timeout
;
set
global
tokudb_lock_timeout
=
1000000
;
set
session
tokudb_lock_timeout
=
1000000
;
select
@@
tokudb_lock_timeout
;
set
global
tokudb_lock_timeout
=
4000
;
set
session
tokudb_lock_timeout
=
4000
;
select
@@
tokudb_lock_timeout
;
mysql-test/suite/tokudb/t/locks-blocking-row-locks.test
View file @
cebeda04
# Tokutek
# Blocking row lock tests;
# Generated by
blocking-row-locks-testgen.py on 2011-11-11
;
# Generated by
locks-blocking-row-locks-testgen.py on 2013-10-14
;
# prepare with some common parameters
connect
(
conn1
,
localhost
,
root
);
...
...
@@ -22,7 +22,10 @@ insert ignore t values(5, 25);
insert
ignore
t
values
(
6
,
36
);
# testing with timeout 0
set
global
tokudb_lock_timeout
=
0
;
connection
conn1
;
set
session
tokudb_lock_timeout
=
0
;
connection
conn2
;
set
session
tokudb_lock_timeout
=
0
;
# testing each point query vs each point query
# testing conflict "select for update" vs. "select for update"
...
...
@@ -842,7 +845,10 @@ commit;
connection
conn1
;
# testing with timeout 500
set
global
tokudb_lock_timeout
=
500
;
connection
conn1
;
set
session
tokudb_lock_timeout
=
500
;
connection
conn2
;
set
session
tokudb_lock_timeout
=
500
;
# testing each point query vs each point query
# testing conflict "select for update" vs. "select for update"
...
...
@@ -1971,5 +1977,4 @@ connection conn2;
reap
;
# clean it all up
drop
table
t
;
set
global
tokudb_lock_timeout
=
4000
;
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