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
12253aba
Commit
12253aba
authored
Feb 13, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-714 LP:1020645 - crash (sig 11) with union query
Don't ignore the error from st_select_lex_unit::optimize()
parent
4b57720c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
mysql-test/r/union_crash-714.result
mysql-test/r/union_crash-714.result
+5
-0
mysql-test/t/union_crash-714.test
mysql-test/t/union_crash-714.test
+9
-0
sql/sql_union.cc
sql/sql_union.cc
+2
-1
No files found.
mysql-test/r/union_crash-714.result
0 → 100644
View file @
12253aba
create table t1 (i tinyint);
set debug='+d,bug11747970_raise_error';
insert into t1 (i) select i from t1 union select i from t1;
ERROR 70100: Query execution was interrupted
drop table t1;
mysql-test/t/union_crash-714.test
0 → 100644
View file @
12253aba
#
# MDEV-714 LP:1020645 - crash (sig 11) with union query
#
--
source
include
/
have_debug
.
inc
create
table
t1
(
i
tinyint
);
set
debug
=
'+d,bug11747970_raise_error'
;
--
error
ER_QUERY_INTERRUPTED
insert
into
t1
(
i
)
select
i
from
t1
union
select
i
from
t1
;
drop
table
t1
;
sql/sql_union.cc
View file @
12253aba
...
...
@@ -629,7 +629,8 @@ bool st_select_lex_unit::exec()
if
(
!
(
uncacheable
&
~
UNCACHEABLE_EXPLAIN
)
&&
item
)
item
->
make_const
();
saved_error
=
optimize
();
if
((
saved_error
=
optimize
()))
DBUG_RETURN
(
saved_error
);
if
(
uncacheable
||
!
item
||
!
item
->
assigned
()
||
describe
)
{
...
...
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