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
fb01230a
Commit
fb01230a
authored
Dec 27, 2006
by
svoj@mysql.com/april.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After merge fix.
parent
2fc0bca6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
sql/sql_update.cc
sql/sql_update.cc
+5
-3
No files found.
sql/sql_update.cc
View file @
fb01230a
...
...
@@ -1079,10 +1079,11 @@ int multi_update::prepare(List<Item> ¬_used_values,
*/
static
bool
safe_update_on_fly
(
THD
*
thd
,
JOIN_TAB
*
join_tab
,
TABLE_LIST
*
all_tables
,
List
<
Item
>
*
fields
)
TABLE_LIST
*
table_ref
,
TABLE_LIST
*
all_tables
,
List
<
Item
>
*
fields
)
{
TABLE
*
table
=
join_tab
->
table
;
if
(
unique_table
(
thd
,
table
,
all_tables
))
if
(
unique_table
(
thd
,
table
_ref
,
all_tables
))
return
0
;
switch
(
join_tab
->
type
)
{
case
JT_SYSTEM
:
...
...
@@ -1142,7 +1143,8 @@ multi_update::initialize_tables(JOIN *join)
table
->
file
->
extra
(
HA_EXTRA_IGNORE_DUP_KEY
);
if
(
table
==
main_table
)
// First table in join
{
if
(
safe_update_on_fly
(
thd
,
join
->
join_tab
,
all_tables
,
&
temp_fields
))
if
(
safe_update_on_fly
(
thd
,
join
->
join_tab
,
table_ref
,
all_tables
,
&
temp_fields
))
{
table_to_update
=
main_table
;
// Update table on the fly
continue
;
...
...
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