diff options
| author | monty@donna.mysql.com <> | 2000-09-20 04:54:10 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-09-20 04:54:10 +0300 |
| commit | dc4525636ce2912fb9a455503260760621e2eb46 (patch) | |
| tree | 9809b1ec91af01ed8cc76e542fe1a102e239d9b1 /sql/sql_delete.cc | |
| parent | f2f515e5c2733dfe95471640ff740d0f936579b9 (diff) | |
| download | mariadb-git-dc4525636ce2912fb9a455503260760621e2eb46.tar.gz | |
Small bug fixes + code for DELETE QUICK
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 3662895a4a3..9cd3c2f0e9b 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -101,7 +101,7 @@ int generate_table(THD *thd, TABLE_LIST *table_list, int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit, - thr_lock_type lock_type) + thr_lock_type lock_type, ulong options) { int error; TABLE *table; @@ -162,6 +162,8 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit, } (void) table->file->extra(HA_EXTRA_NO_READCHECK); + if (options & OPTION_QUICK) + (void) table->file->extra(HA_EXTRA_QUICK); init_read_record(&info,thd,table,select,1,1); ulong deleted=0L; thd->proc_info="updating"; @@ -188,7 +190,9 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit, } thd->proc_info="end"; end_read_record(&info); - VOID(table->file->extra(HA_EXTRA_READCHECK)); + (void) table->file->extra(HA_EXTRA_READCHECK); + if (options & OPTION_QUICK) + (void) table->file->extra(HA_EXTRA_NORMAL); if (deleted) { mysql_update_log.write(thd,thd->query, thd->query_length); |