diff options
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 6bb1c510013..3f2860f4b2b 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -153,7 +153,7 @@ public: Item_str_conv(Item *item) :Item_str_func(item) {} void fix_length_and_dec() { - set_charset(args[0]->charset(), args[0]->coercibility); + set_charset(*args[0]); max_length = args[0]->max_length; } }; @@ -335,7 +335,7 @@ public: class Item_func_database :public Item_str_func { public: - Item_func_database() { coercibility= COER_IMPLICIT; } + Item_func_database() { set_charset(DERIVATION_IMPLICIT); } String *val_str(String *); void fix_length_and_dec() { @@ -348,7 +348,7 @@ public: class Item_func_user :public Item_str_func { public: - Item_func_user() { coercibility= COER_IMPLICIT; } + Item_func_user() { set_charset(DERIVATION_IMPLICIT); } String *val_str(String *); void fix_length_and_dec() { @@ -549,7 +549,7 @@ public: const char *func_name() const { return "load_file"; } void fix_length_and_dec() { - set_charset(&my_charset_bin, COER_COERCIBLE); + set_charset(&my_charset_bin, DERIVATION_COERCIBLE); maybe_null=1; max_length=MAX_BLOB_WIDTH; } @@ -586,7 +586,7 @@ public: String *val_str(String *); void fix_length_and_dec() { - set_charset(args[0]->charset(), args[0]->coercibility); + set_charset(*args[0]); max_length= args[0]->max_length * 2 + 2; } }; |