Allow to convert to non-Unicode charset when mixing a string

constant with a column. The string is converted into the column
character set. It conversion doesn't lose data, then operation
is possible. Otherwise, give an error, as it was earlier.


sql/item.h:
  Change bool argument to uint flags:
  we have now two different flags.

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 6e43d66a32d..963038227a2 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -141,10 +141,10 @@ public:
   Item *get_tmp_table_item(THD *thd);
   
   bool agg_arg_collations(DTCollation &c, Item **items, uint nitems,
-                          bool allow_superset_conversion= FALSE);
+                          uint flags= 0);
   bool agg_arg_collations_for_comparison(DTCollation &c,
                                          Item **items, uint nitems,
-                                         bool allow_superset_comversion= FALSE);
+                                         uint flags= 0);
 
   bool walk(Item_processor processor, byte *arg);
 };