now my_printf_error is not better then my_error, but my_error call is shorter

used only one implementation of format parser of (printf)
fixed multistatement

1 files changed, 5 insertions, 6 deletions

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 63d20b2dab3..4a4485ba2da 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -53,11 +53,10 @@ static void agg_cmp_type(Item_result *type, Item **items, uint nitems)
 
 static void my_coll_agg_error(DTCollation &c1, DTCollation &c2, const char *fname)
 {
-  my_printf_error(ER_CANT_AGGREGATE_2COLLATIONS,
-                  ER(ER_CANT_AGGREGATE_2COLLATIONS), MYF(0),
-                  c1.collation->name,c1.derivation_name(),
-                  c2.collation->name,c2.derivation_name(),
-                  fname);
+  my_error(ER_CANT_AGGREGATE_2COLLATIONS, MYF(0),
+           c1.collation->name,c1.derivation_name(),
+           c2.collation->name,c2.derivation_name(),
+           fname);
 }
 
 
@@ -2437,7 +2436,7 @@ Item_func_regex::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
 		       cmp_collation.collation)))
     {
       (void) regerror(error,&preg,buff,sizeof(buff));
-      my_printf_error(ER_REGEXP_ERROR,ER(ER_REGEXP_ERROR),MYF(0),buff);
+      my_error(ER_REGEXP_ERROR, MYF(0), buff);
       return TRUE;
     }
     regex_compiled=regex_is_const=1;