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
c5d8497e
Commit
c5d8497e
authored
May 07, 2004
by
bell@sanja.is.com.ua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
postreview fixes
parent
a31452c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
sql/sql_lex.h
sql/sql_lex.h
+4
-1
sql/sql_union.cc
sql/sql_union.cc
+2
-1
No files found.
sql/sql_lex.h
View file @
c5d8497e
...
@@ -332,7 +332,10 @@ public:
...
@@ -332,7 +332,10 @@ public:
Item_subselect
*
item
;
Item_subselect
*
item
;
/* thread handler */
/* thread handler */
THD
*
thd
;
THD
*
thd
;
/* fake SELECT_LEX for union processing */
/*
SELECT_LEX for hidden SELECT in onion which process global
ORDER BY and LIMIT
*/
st_select_lex
*
fake_select_lex
;
st_select_lex
*
fake_select_lex
;
st_select_lex
*
union_distinct
;
/* pointer to the last UNION DISTINCT */
st_select_lex
*
union_distinct
;
/* pointer to the last UNION DISTINCT */
...
...
sql/sql_union.cc
View file @
c5d8497e
...
@@ -263,7 +263,8 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
...
@@ -263,7 +263,8 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
union_result
->
set_table
(
table
);
union_result
->
set_table
(
table
);
thd_arg
->
lex
->
current_select
=
lex_select_save
;
thd_arg
->
lex
->
current_select
=
lex_select_save
;
if
(
!
item_list
.
elements
){
if
(
!
item_list
.
elements
)
{
Statement
*
stmt
=
thd
->
current_statement
;
Statement
*
stmt
=
thd
->
current_statement
;
Statement
backup
;
Statement
backup
;
if
(
stmt
)
if
(
stmt
)
...
...
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