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
a23fdf7f
Commit
a23fdf7f
authored
Nov 08, 2004
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After merge fixes
parent
70d66da8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
0 deletions
+10
-0
sql/item.cc
sql/item.cc
+7
-0
sql/item.h
sql/item.h
+1
-0
sql/item_func.cc
sql/item_func.cc
+2
-0
No files found.
sql/item.cc
View file @
a23fdf7f
...
...
@@ -1733,6 +1733,13 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
return
0
;
}
Item
*
Item_field
::
safe_charset_converter
(
CHARSET_INFO
*
tocs
)
{
no_const_subst
=
1
;
return
Item
::
safe_charset_converter
(
tocs
);
}
void
Item_field
::
cleanup
()
{
DBUG_ENTER
(
"Item_field::cleanup"
);
...
...
sql/item.h
View file @
a23fdf7f
...
...
@@ -561,6 +561,7 @@ class Item_field :public Item_ident
bool
replace_equal_field_processor
(
byte
*
arg
);
inline
uint32
max_disp_length
()
{
return
field
->
max_length
();
}
Item_field
*
filed_for_view_update
()
{
return
this
;
}
Item
*
safe_charset_converter
(
CHARSET_INFO
*
tocs
);
friend
class
Item_default_value
;
friend
class
Item_insert_value
;
friend
class
st_select_lex_unit
;
...
...
sql/item_func.cc
View file @
a23fdf7f
...
...
@@ -193,6 +193,8 @@ bool Item_func::agg_arg_charsets(DTCollation &coll,
res
=
TRUE
;
break
;
// we cannot return here, we need to restore "arena".
}
if
((
*
arg
)
->
type
()
==
FIELD_ITEM
)
((
Item_field
*
)(
*
arg
))
->
no_const_subst
=
1
;
conv
->
fix_fields
(
thd
,
0
,
&
conv
);
*
arg
=
conv
;
}
...
...
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