diff options
| author | monty@hundin.mysql.fi <> | 2001-06-14 15:14:27 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-06-14 15:14:27 +0300 |
| commit | 595d087e05579a9b8420b9267423b054fcca42c9 (patch) | |
| tree | 171f982f519dc6a7b24a7436c825712bdd306300 | |
| parent | a18444412495badef196ae65342e9f9da648d270 (diff) | |
| parent | c417a276ac6337b7beb56c6b37213ff9c4d59fcd (diff) | |
| download | mariadb-git-595d087e05579a9b8420b9267423b054fcca42c9.tar.gz | |
merge
| -rw-r--r-- | sql/sql_class.h | 8 | ||||
| -rw-r--r-- | sql/sql_delete.cc | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index efaf6eb02a3..6963b890051 100644 --- a/sql/sql_class.h +++ b/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; } diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 30b0f8a82bb..dbcd38180dc 100644 --- a/sql/sql_delete.cc +++ b/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 |