merge

sql/sql_class.h

@@ -603,12 +603,14 @@ public:
    byte * dup_checking;
    THD *thd;
    ha_rows deleted;
-   int num_of_tables, error;
+   uint num_of_tables;
+   int error;
    thr_lock_type lock_option;
    bool do_delete;
  public:
-   multi_delete(TABLE_LIST *dt, thr_lock_type o, uint n)
-     : delete_tables(dt), deleted(0), num_of_tables(n), error(0), lock_option(o)
+   multi_delete(TABLE_LIST *dt, thr_lock_type lock_option_arg, uint n)
+     : delete_tables (dt), deleted(0), num_of_tables(n), error(0),
+       lock_option(lock_option_arg)
    {
      thd = current_thd; do_delete = false;
    }

sql/sql_delete.cc

@@ -809,7 +809,8 @@ int  multi_delete::do_deletes (bool from_send_error)
 #ifdef SINISAS_STRIP
       delete select;
 #endif
-      if (error = -1) error = 0;
+      if (error == -1)
+	error = 0;
 #if 0
     }
 #endif