1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup; Fixed type bug in new delete code.

Browse Source
This commit is contained in:
monty@hundin.mysql.fi 2001-06-14 15:12:01 +03:00
parent 0054d8dd85
commit c417a276ac
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.h
View File

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

3
sql/sql_delete.cc
View File

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