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
12f20c15
Commit
12f20c15
authored
Nov 08, 2022
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Work around MDEV-24813 in main.rowid_filter_innodb_debug
Let us avoid excessive allocation of explicit record locks.
parent
93b4f84a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
32 deletions
+16
-32
mysql-test/include/rowid_filter_debug_kill.inc
mysql-test/include/rowid_filter_debug_kill.inc
+6
-12
mysql-test/main/rowid_filter_innodb_debug.result
mysql-test/main/rowid_filter_innodb_debug.result
+5
-10
mysql-test/main/rowid_filter_innodb_debug.test
mysql-test/main/rowid_filter_innodb_debug.test
+0
-1
mysql-test/main/rowid_filter_myisam_debug.result
mysql-test/main/rowid_filter_myisam_debug.result
+5
-9
No files found.
mysql-test/include/rowid_filter_debug_kill.inc
View file @
12f20c15
--
source
include
/
have_debug
.
inc
--
source
include
/
have_debug_sync
.
inc
--
source
include
/
have_sequence
.
inc
--
source
include
/
count_sessions
.
inc
--
echo
#
--
echo
# MDEV-22761 KILL QUERY during rowid_filter, crashes
--
echo
#
create
table
t0
(
a
int
);
insert
into
t0
values
(
0
),(
1
),(
2
),(
3
),(
4
),(
5
),(
6
),(
7
),(
8
),(
9
);
# 100 rows
create
table
t2
(
a
int
);
insert
into
t2
select
A
.
a
+
B
.
a
*
10
from
t0
A
,
t0
B
;
insert
into
t2
select
*
from
seq_0_to_99
;
# 10K rows
CREATE
TABLE
t3
(
...
...
@@ -26,11 +23,10 @@ where table_schema=database() and table_name='t3';
insert
into
t3
select
A
.
a
,
B
.
a
,
A
.
seq
,
B
.
seq
,
'filler-data-filler-data'
from
t2
A
,
t2
B
;
from
seq_0_to_99
A
,
seq_0_to_99
B
;
analyze
table
t2
,
t3
;
...
...
@@ -48,7 +44,6 @@ where
t3
.
key1
=
t2
.
a
and
t3
.
key2
in
(
2
,
3
);
connect
(
con1
,
localhost
,
root
,,);
connection
con1
;
set
debug_sync
=
'now WAIT_FOR at_rowid_filter_check'
;
evalp
kill
query
$target_id
;
set
debug_sync
=
'now SIGNAL go'
;
...
...
@@ -60,6 +55,5 @@ disconnect con1;
reap
;
set
debug_sync
=
'RESET'
;
drop
table
t
0
,
t
2
,
t3
;
drop
table
t2
,
t3
;
--
source
include
/
wait_until_count_sessions
.
inc
mysql-test/main/rowid_filter_innodb_debug.result
View file @
12f20c15
...
...
@@ -2,10 +2,8 @@ set default_storage_engine=innodb;
#
# MDEV-22761 KILL QUERY during rowid_filter, crashes
#
create table t0(a int);
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t2(a int);
insert into t2 select
A.a + B.a* 10 from t0 A, t0 B
;
insert into t2 select
* from seq_0_to_99
;
CREATE TABLE t3 (
key1 int ,
key2 int,
...
...
@@ -19,11 +17,10 @@ engine
InnoDB
insert into t3
select
A.
a
,
B.
a
,
A.
seq
,
B.
seq
,
'filler-data-filler-data'
from
t2 A, t2 B;
from seq_0_to_99 A, seq_0_to_99 B;
analyze table t2,t3;
Table Op Msg_type Msg_text
test.t2 analyze status Engine-independent statistics collected
...
...
@@ -42,7 +39,6 @@ select * from t2, t3
where
t3.key1=t2.a and t3.key2 in (2,3);
connect con1, localhost, root,,;
connection con1;
set debug_sync='now WAIT_FOR at_rowid_filter_check';
kill query $target_id;
set debug_sync='now SIGNAL go';
...
...
@@ -50,7 +46,7 @@ connection default;
disconnect con1;
ERROR 70100: Query execution was interrupted
set debug_sync='RESET';
drop table t
0,t
2,t3;
drop table t2,t3;
set default_storage_engine=default;
set @save_optimizer_switch= @@optimizer_switch;
set @save_use_stat_tables= @@use_stat_tables;
...
...
@@ -77,7 +73,6 @@ test.t1 analyze status OK
set debug_sync='handler_rowid_filter_check SIGNAL killme WAIT_FOR go';
SELECT * FROM t1 WHERE a > 0 AND b=0;
connect con1, localhost, root,,;
connection con1;
set debug_sync='now WAIT_FOR killme';
kill query @id;
set debug_sync='now SIGNAL go';
...
...
mysql-test/main/rowid_filter_innodb_debug.test
View file @
12f20c15
...
...
@@ -39,7 +39,6 @@ set debug_sync='handler_rowid_filter_check SIGNAL killme WAIT_FOR go';
send
SELECT
*
FROM
t1
WHERE
a
>
0
AND
b
=
0
;
connect
(
con1
,
localhost
,
root
,,);
connection
con1
;
let
$ignore
=
`SELECT @id := $ID`
;
set
debug_sync
=
'now WAIT_FOR killme'
;
kill
query
@
id
;
...
...
mysql-test/main/rowid_filter_myisam_debug.result
View file @
12f20c15
#
# MDEV-22761 KILL QUERY during rowid_filter, crashes
#
create table t0(a int);
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
create table t2(a int);
insert into t2 select
A.a + B.a* 10 from t0 A, t0 B
;
insert into t2 select
* from seq_0_to_99
;
CREATE TABLE t3 (
key1 int ,
key2 int,
...
...
@@ -18,11 +16,10 @@ engine
MyISAM
insert into t3
select
A.
a
,
B.
a
,
A.
seq
,
B.
seq
,
'filler-data-filler-data'
from
t2 A, t2 B;
from seq_0_to_99 A, seq_0_to_99 B;
analyze table t2,t3;
Table Op Msg_type Msg_text
test.t2 analyze status Engine-independent statistics collected
...
...
@@ -41,7 +38,6 @@ select * from t2, t3
where
t3.key1=t2.a and t3.key2 in (2,3);
connect con1, localhost, root,,;
connection con1;
set debug_sync='now WAIT_FOR at_rowid_filter_check';
kill query $target_id;
set debug_sync='now SIGNAL go';
...
...
@@ -49,4 +45,4 @@ connection default;
disconnect con1;
ERROR 70100: Query execution was interrupted
set debug_sync='RESET';
drop table t
0,t
2,t3;
drop table t2,t3;
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