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
28faf5e4
Commit
28faf5e4
authored
Nov 07, 2006
by
gkodinov@dl145s.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item.cc:
merge fixes
parent
ccf17e71
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
sql/item.cc
sql/item.cc
+3
-3
No files found.
sql/item.cc
View file @
28faf5e4
...
...
@@ -3727,16 +3727,16 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
Item_ref to point to the Item in the select list and replace the
Item_field created by the parser with the new Item_ref.
*/
Item_ref
*
rf
=
new
Item_ref
(
db_name
,
table_name
,
field_name
);
Item_ref
*
rf
=
new
Item_ref
(
context
,
db_name
,
table_name
,
field_name
);
if
(
!
rf
)
return
1
;
thd
->
change_item_tree
(
ref
,
rf
);
thd
->
change_item_tree
(
ref
erence
,
rf
);
/*
Because Item_ref never substitutes itself with other items
in Item_ref::fix_fields(), we can safely use the original
pointer to it even after fix_fields()
*/
return
rf
->
fix_fields
(
thd
,
tables
,
ref
)
||
rf
->
check_cols
(
1
);
return
rf
->
fix_fields
(
thd
,
reference
)
||
rf
->
check_cols
(
1
);
}
}
}
...
...
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