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
b3188829
Commit
b3188829
authored
Nov 08, 2010
by
Sergey Glukhov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug#52711 Segfault when doing EXPLAIN SELECT with union...order by (select... where...)
backport from 5.1
parent
ff24facf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
2 deletions
+40
-2
mysql-test/r/subselect.result
mysql-test/r/subselect.result
+16
-0
mysql-test/t/subselect.test
mysql-test/t/subselect.test
+21
-0
sql/sql_select.cc
sql/sql_select.cc
+3
-2
No files found.
mysql-test/r/subselect.result
View file @
b3188829
...
...
@@ -4527,4 +4527,20 @@ pk int_key
3 3
7 3
DROP TABLE t1,t2;
#
# Bug #52711: Segfault when doing EXPLAIN SELECT with
# union...order by (select... where...)
#
CREATE TABLE t1 (a VARCHAR(10), FULLTEXT KEY a (a));
INSERT INTO t1 VALUES (1),(2);
CREATE TABLE t2 (b INT);
INSERT INTO t2 VALUES (1),(2);
# Should not crash
EXPLAIN
SELECT * FROM t2 UNION SELECT * FROM t2
ORDER BY (SELECT * FROM t1 WHERE MATCH(a) AGAINST ('+abc' IN BOOLEAN MODE));
# Should not crash
SELECT * FROM t2 UNION SELECT * FROM t2
ORDER BY (SELECT * FROM t1 WHERE MATCH(a) AGAINST ('+abc' IN BOOLEAN MODE));
DROP TABLE t1,t2;
End of 5.0 tests.
mysql-test/t/subselect.test
View file @
b3188829
...
...
@@ -3506,5 +3506,26 @@ ORDER BY outr.pk;
DROP
TABLE
t1
,
t2
;
--
echo
#
--
echo
# Bug #52711: Segfault when doing EXPLAIN SELECT with
--
echo
# union...order by (select... where...)
--
echo
#
CREATE
TABLE
t1
(
a
VARCHAR
(
10
),
FULLTEXT
KEY
a
(
a
));
INSERT
INTO
t1
VALUES
(
1
),(
2
);
CREATE
TABLE
t2
(
b
INT
);
INSERT
INTO
t2
VALUES
(
1
),(
2
);
--
echo
# Should not crash
--
disable_result_log
EXPLAIN
SELECT
*
FROM
t2
UNION
SELECT
*
FROM
t2
ORDER
BY
(
SELECT
*
FROM
t1
WHERE
MATCH
(
a
)
AGAINST
(
'+abc'
IN
BOOLEAN
MODE
));
--
echo
# Should not crash
SELECT
*
FROM
t2
UNION
SELECT
*
FROM
t2
ORDER
BY
(
SELECT
*
FROM
t1
WHERE
MATCH
(
a
)
AGAINST
(
'+abc'
IN
BOOLEAN
MODE
));
DROP
TABLE
t1
,
t2
;
--
enable_result_log
--
echo
End
of
5.0
tests
.
sql/sql_select.cc
View file @
b3188829
...
...
@@ -501,7 +501,7 @@ JOIN::prepare(Item ***rref_pointer_array,
thd
->
lex
->
allow_sum_func
=
save_allow_sum_func
;
}
if
(
!
thd
->
lex
->
view_prepare_mode
)
if
(
!
thd
->
lex
->
view_prepare_mode
&&
!
(
select_options
&
SELECT_DESCRIBE
)
)
{
Item_subselect
*
subselect
;
/* Is it subselect? */
...
...
@@ -6861,7 +6861,8 @@ remove_const(JOIN *join,ORDER *first_order, COND *cond,
*
simple_order
=
0
;
// Must do a temp table to sort
else
if
(
!
(
order_tables
&
not_const_tables
))
{
if
(
order
->
item
[
0
]
->
with_subselect
)
if
(
order
->
item
[
0
]
->
with_subselect
&&
!
(
join
->
select_lex
->
options
&
SELECT_DESCRIBE
))
order
->
item
[
0
]
->
val_str
(
&
order
->
item
[
0
]
->
str_value
);
DBUG_PRINT
(
"info"
,(
"removing: %s"
,
order
->
item
[
0
]
->
full_name
()));
continue
;
// skip const item
...
...
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