merge fix

libmysql/libmysql.c:
  Auto merged
libmysql/password.c:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/password.c:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/sql_class.h

@@ -682,7 +682,7 @@ public:
   }
   virtual bool send_fields(List<Item> &list,uint flag)=0;
   virtual bool send_data(List<Item> &items)=0;
-  virtual void initialize_tables (JOIN *join=0) {}
+  virtual bool initialize_tables (JOIN *join=0) { return 0; }
   virtual void send_error(uint errcode,const char *err)
   {
     my_message(errcode, err, MYF(0));
@@ -746,10 +746,10 @@ class select_insert :public select_result {
   List<Item> *fields;
   ulonglong last_insert_id;
   COPY_INFO info;
-  uint save_time_stamp;
 
   select_insert(TABLE *table_par,List<Item> *fields_par,enum_duplicates duplic)
-    :table(table_par),fields(fields_par), last_insert_id(0), save_time_stamp(0)  {
+    :table(table_par),fields(fields_par), last_insert_id(0)
+  {
     bzero((char*) &info,sizeof(info));
     info.handle_duplicates=duplic;
   }
@@ -793,8 +793,8 @@ class select_union :public select_result {
  public:
   TABLE *table;
   COPY_INFO info;
-  uint save_time_stamp;
   TMP_TABLE_PARAM *tmp_table_param;
+  bool not_describe;
 
   select_union(TABLE *table_par);
   ~select_union();
@@ -926,58 +926,61 @@ public:
   friend int unique_write_to_ptrs(gptr key, element_count count, Unique *unique);
 };
 
- class multi_delete : public select_result {
-   TABLE_LIST *delete_tables, *table_being_deleted;
+class multi_delete : public select_result
+{
+  TABLE_LIST *delete_tables, *table_being_deleted;
 #ifdef SINISAS_STRIP
-   IO_CACHE **tempfiles;
-   byte *memory_lane;
+  IO_CACHE **tempfiles;
+  byte *memory_lane;
 #else
-   Unique  **tempfiles;
+  Unique  **tempfiles;
 #endif
-   THD *thd;
-   ha_rows deleted;
-   uint num_of_tables;
-   int error;
-   bool do_delete, transactional_tables, log_delayed, normal_tables;
- public:
-   multi_delete(THD *thd, TABLE_LIST *dt, uint num_of_tables);
-   ~multi_delete();
-   int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-   bool send_fields(List<Item> &list,
+  THD *thd;
+  ha_rows deleted;
+  uint num_of_tables;
+  int error;
+  bool do_delete, transactional_tables, log_delayed, normal_tables;
+public:
+  multi_delete(THD *thd, TABLE_LIST *dt, uint num_of_tables);
+  ~multi_delete();
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
+  bool send_fields(List<Item> &list,
  		   uint flag) { return 0; }
-   bool send_data(List<Item> &items);
-   void initialize_tables (JOIN *join);
-   void send_error(uint errcode,const char *err);
-   int  do_deletes (bool from_send_error);
-   bool send_eof();
- };
+  bool send_data(List<Item> &items);
+  bool initialize_tables (JOIN *join);
+  void send_error(uint errcode,const char *err);
+  int  do_deletes (bool from_send_error);
+  bool send_eof();
+};
+
+
+class multi_update : public select_result
+{
+  TABLE_LIST *all_tables, *update_tables, *table_being_updated;
+  THD *thd;
+  TABLE **tmp_tables, *main_table;
+  TMP_TABLE_PARAM *tmp_table_param;
+  ha_rows updated, found;
+  List <Item> *fields, *values;
+  List <Item> **fields_for_table, **values_for_table;
+  uint table_count;
+  Copy_field *copy_field;
+  enum enum_duplicates handle_duplicates;
+  bool do_update, trans_safe, transactional_tables, log_delayed;
+
+public:
+  multi_update(THD *thd_arg, TABLE_LIST *ut, List<Item> *fields,
+	       List<Item> *values, enum_duplicates handle_duplicates);
+  ~multi_update();
+  int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
+  bool send_fields(List<Item> &list, uint flag) { return 0; }
+  bool send_data(List<Item> &items);
+  bool initialize_tables (JOIN *join);
+  void send_error(uint errcode,const char *err);
+  int  do_updates (bool from_send_error);
+  bool send_eof();
+};
 
- class multi_update : public select_result {
-   TABLE_LIST *update_tables, *table_being_updated;
-   COPY_INFO *infos;
-   TABLE **tmp_tables;
-   THD *thd;
-   ha_rows updated, found;
-   List<Item> fields;
-   List <Item> **fields_by_tables;
-   enum enum_duplicates dupl;
-   uint num_of_tables, num_fields, num_updated, *save_time_stamps, *field_sequence;
-   int error;
-   bool do_update, not_trans_safe;
- public:
-   multi_update(THD *thd_arg, TABLE_LIST *ut, List<Item> &fs, 		 
-		enum enum_duplicates handle_duplicates,  
-		uint num);
-   ~multi_update();
-   int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
-   bool send_fields(List<Item> &list,
- 		   uint flag) { return 0; }
-   bool send_data(List<Item> &items);
-   void initialize_tables (JOIN *join);
-   void send_error(uint errcode,const char *err);
-   int  do_updates (bool from_send_error);
-   bool send_eof();
- };
 
 class select_dumpvar :public select_result {
   ha_rows row_count;