diff --git a/sql/item_func.cc b/sql/item_func.cc index db8d2c1..ab129c4 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -7086,7 +7086,6 @@ void Item_func_get_user_var::fix_length_and_dec() unsigned_flag= var_entry->unsigned_flag; max_length= var_entry->length(); - collation.set(var_entry->collation); switch(m_cached_result_type) { case REAL_RESULT: fix_char_length(DBL_DIG + 8); @@ -7107,6 +7106,8 @@ void Item_func_get_user_var::fix_length_and_dec() assert(0); break; } + + collation.set(var_entry->collation); } else {