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
04a6a8e0
Commit
04a6a8e0
authored
19 years ago
by
timour@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post-fix for BUG#6276.
parent
f58315f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
sql/sql_base.cc
sql/sql_base.cc
+14
-4
No files found.
sql/sql_base.cc
View file @
04a6a8e0
...
...
@@ -3763,8 +3763,13 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
TABLE_LIST
*
left_neighbor
,
TABLE_LIST
*
right_neighbor
)
{
Query_arena
*
arena
,
backup
;
bool
result
=
TRUE
;
DBUG_ENTER
(
"store_top_level_join_columns"
);
arena
=
thd
->
change_arena_if_needed
(
&
backup
);
/* Call the procedure recursively for each nested table reference. */
if
(
table_ref
->
nested_join
)
{
...
...
@@ -3797,7 +3802,7 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
if
(
cur_table_ref
->
nested_join
&&
store_top_level_join_columns
(
thd
,
cur_table_ref
,
cur_left_neighbor
,
cur_right_neighbor
))
DBUG_RETURN
(
TRUE
)
;
goto
err
;
cur_right_neighbor
=
cur_table_ref
;
}
}
...
...
@@ -3829,7 +3834,7 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
swap_variables
(
TABLE_LIST
*
,
table_ref_1
,
table_ref_2
);
if
(
mark_common_columns
(
thd
,
table_ref_1
,
table_ref_2
,
using_fields
,
&
found_using_fields
))
DBUG_RETURN
(
TRUE
)
;
goto
err
;
/*
Swap the join operands back, so that we pick the columns of the second
...
...
@@ -3841,7 +3846,7 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
if
(
store_natural_using_join_columns
(
thd
,
table_ref
,
table_ref_1
,
table_ref_2
,
using_fields
,
found_using_fields
))
DBUG_RETURN
(
TRUE
)
;
goto
err
;
/*
Change NATURAL JOIN to JOIN ... ON. We do this for both operands
...
...
@@ -3872,7 +3877,12 @@ store_top_level_join_columns(THD *thd, TABLE_LIST *table_ref,
else
table_ref
->
next_name_resolution_table
=
NULL
;
}
DBUG_RETURN
(
FALSE
);
result
=
FALSE
;
/* All is OK. */
err:
if
(
arena
)
thd
->
restore_backup_item_arena
(
arena
,
&
backup
);
DBUG_RETURN
(
result
);
}
...
...
This diff is collapsed.
Click to expand it.
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