New class DTCollation (SQL:2003 calls it "declared type collation")

It's a combination of collation and its derivation (precedence order)

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 8ef2b85de52..4e39833c467 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -943,7 +943,7 @@ public:
   longlong val_int();
   String *val_str(String *str);
   void update_hash(void *ptr, uint length, enum Item_result type, 
-  		   CHARSET_INFO *cs, enum coercion coercibility);
+  		   CHARSET_INFO *cs, Derivation dv);
   bool update();
   enum Item_result result_type () const { return cached_result_type; }
   bool fix_fields(THD *thd, struct st_table_list *tables, Item **ref);