Merge with 4.0.3

Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)

1 files changed, 1 insertions, 2 deletions

diff --git a/sql/item_uniq.h b/sql/item_uniq.h
index cc087832f49..6ab01d55e2f 100644
--- a/sql/item_uniq.h
+++ b/sql/item_uniq.h
@@ -43,6 +43,5 @@ public:
   bool add() { return 0; }
   void reset_field() {}
   void update_field(int offset) {}
-  bool fix_fields(THD *thd,struct st_table_list *tlist) { return 0;}
-  unsigned int size_of() { return sizeof(*this);}  
+  bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) { return 0;}
 };