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
0a242026
Commit
0a242026
authored
Oct 16, 2002
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix of the small bug in UNION's
parent
6561faa1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
mysql-test/r/heap_btree.result
mysql-test/r/heap_btree.result
+1
-1
sql/sql_union.cc
sql/sql_union.cc
+7
-5
No files found.
mysql-test/r/heap_btree.result
View file @
0a242026
...
@@ -73,8 +73,8 @@ type=heap;
...
@@ -73,8 +73,8 @@ type=heap;
insert into t1 values (1,1),(2,2),(1,3),(2,4),(2,5),(2,6);
insert into t1 values (1,1),(2,2),(1,3),(2,4),(2,5),(2,6);
select * from t1 where x=1;
select * from t1 where x=1;
x y
x y
1 1
1 3
1 3
1 1
select * from t1,t1 as t2 where t1.x=t2.y;
select * from t1,t1 as t2 where t1.x=t2.y;
x y x y
x y x y
1 1 1 1
1 1 1 1
...
...
sql/sql_union.cc
View file @
0a242026
...
@@ -109,7 +109,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result)
...
@@ -109,7 +109,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result)
if
(
prepared
)
if
(
prepared
)
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
prepared
=
1
;
prepared
=
1
;
union_result
=
0
;
describe
=
(
first_select
()
->
options
&
SELECT_DESCRIBE
)
?
1
:
0
;
describe
=
(
first_select
()
->
options
&
SELECT_DESCRIBE
)
?
1
:
0
;
res
=
0
;
res
=
0
;
found_rows_for_union
=
false
;
found_rows_for_union
=
false
;
...
@@ -309,10 +309,12 @@ int st_select_lex_unit::exec()
...
@@ -309,10 +309,12 @@ int st_select_lex_unit::exec()
int
st_select_lex_unit
::
cleanup
()
int
st_select_lex_unit
::
cleanup
()
{
{
DBUG_ENTER
(
"st_select_lex_unit::cleanup"
);
DBUG_ENTER
(
"st_select_lex_unit::cleanup"
);
if
(
union_result
)
{
delete
union_result
;
delete
union_result
;
free_tmp_table
(
thd
,
table
);
free_tmp_table
(
thd
,
table
);
table
=
0
;
// Safety
table
=
0
;
// Safety
}
List_iterator
<
JOIN
*>
j
(
joins
);
List_iterator
<
JOIN
*>
j
(
joins
);
JOIN
**
join
;
JOIN
**
join
;
while
((
join
=
j
++
))
while
((
join
=
j
++
))
...
...
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