From c7db0a813cdf91855b885c6d9bf85e12716d8e00 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Apr 2003 10:26:36 +0500 Subject: Better error message --- sql/item_strfunc.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'sql/item_strfunc.cc') diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 3b2e4072b18..5b2706e3eef 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2166,17 +2166,11 @@ void Item_func_set_collation::fix_length_and_dec() MY_CS_BINSORT,MYF(0)); else set_collation= get_charset_by_name(colname,MYF(0)); - - if (!set_collation) - { - my_error(ER_UNKNOWN_CHARACTER_SET, MYF(0), str->c_ptr()); - return; - } - - if (!my_charset_same(args[0]->charset(),set_collation)) + + if (!set_collation || !my_charset_same(args[0]->charset(),set_collation)) { my_error(ER_COLLATION_CHARSET_MISMATCH, MYF(0), - set_collation->name,args[0]->charset()->csname); + colname,args[0]->charset()->csname); return; } set_charset(set_collation, COER_EXPLICIT); -- cgit v1.2.1