mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

After merge fixes

Browse source
This commit is contained in:
monty@mysql.com 2004-11-08 01:51:10 +02:00
parent 071001950e
commit 07f9c634ad
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sql/item.cc
View file

@ -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");

1
sql/item.h
View file

@ -561,6 +561,7 @@ public:
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;

2
sql/item_func.cc
View file

@ -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;
}