merge with 4.0 to get last fixes to last merge

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  merge with 4.0

1 files changed, 3 insertions, 9 deletions

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index ea5f4a6b0bf..302ad88905e 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -495,16 +495,10 @@ class Item_func_like :public Item_bool_func2
   enum { alphabet_size = 256 };
 
 public:
-  Item_func_like::Item_func_like(Item *a,Item *b, char* escape_arg) :
-    Item_bool_func2(a,b),
-    escape(*escape_arg),
-    canDoTurboBM(false),
-    pattern(0),
-    pattern_len(0),
-    bmGs(0),
-    bmBc(0)
+  Item_func_like(Item *a,Item *b, char* escape_arg)
+    :Item_bool_func2(a,b), escape(*escape_arg), canDoTurboBM(false),
+    pattern(0), pattern_len(0), bmGs(0), bmBc(0)
   {}
-
   longlong val_int();
   enum Functype functype() const { return LIKE_FUNC; }
   optimize_type select_optimize() const;