diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-15 22:01:28 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-11-15 22:01:28 +0200 |
| commit | d798928d0e248b8d7c0bc38f38388f7854d85429 (patch) | |
| tree | 7795dea67805d7e81e9370e557305a2405330864 /sql | |
| parent | 95ff7f77dd8dbbe804139e53c5fa521dfd13fa36 (diff) | |
| download | mariadb-git-d798928d0e248b8d7c0bc38f38388f7854d85429.tar.gz | |
A fix for safe updates
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_delete.cc | 8 | ||||
| -rw-r--r-- | sql/sql_update.cc | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index c40e8a4e947..8fd8488ffa3 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -35,13 +35,13 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, SQL_SELECT *select=0; READ_RECORD info; bool using_limit=limit != HA_POS_ERROR; - bool transactional_table, log_delayed; + bool transactional_table, log_delayed, safe_update; ha_rows deleted; DBUG_ENTER("mysql_delete"); if (!table_list->db) table_list->db=thd->db; - if ((thd->options & OPTION_SAFE_UPDATES) && !conds) + if (((safe_update=thd->options & OPTION_SAFE_UPDATES)) && !conds) { send_error(&thd->net,ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE); DBUG_RETURN(1); @@ -57,7 +57,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, /* Test if the user wants to delete all rows */ if (!using_limit && (!conds || conds->const_item()) && - !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE))) + !(specialflag & (SPECIAL_NO_NEW_FUNC | SPECIAL_SAFE_MODE)) && !safe_update) { deleted= table->file->records; if (!(error=table->file->delete_all_rows())) @@ -91,7 +91,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, if (!table->quick_keys) { thd->lex.select_lex.options|=QUERY_NO_INDEX_USED; - if ((thd->options & OPTION_SAFE_UPDATES) && limit == HA_POS_ERROR) + if (safe_update && !using_limit) { delete select; send_error(&thd->net,ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE); diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 0b440eb3060..f2d2b71bd5b 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -53,7 +53,7 @@ int mysql_update(THD *thd, enum enum_duplicates handle_duplicates, thr_lock_type lock_type) { - bool using_limit=limit != HA_POS_ERROR; + bool using_limit=limit != HA_POS_ERROR, safe_update= thd->options & OPTION_SAFE_UPDATES; bool used_key_is_modified, transactional_table, log_delayed; int error=0; uint save_time_stamp, used_index, want_privilege; @@ -117,9 +117,7 @@ int mysql_update(THD *thd, table->used_keys=0; select=make_select(table,0,0,conds,&error); if (error || - (select && select->check_quick(test(thd->options & OPTION_SAFE_UPDATES), - limit)) || - !limit) + (select && select->check_quick(safe_update, limit)) || !limit) { delete select; table->time_stamp=save_time_stamp; // Restore timestamp pointer @@ -134,7 +132,7 @@ int mysql_update(THD *thd, if (!table->quick_keys) { thd->lex.select_lex.options|=QUERY_NO_INDEX_USED; - if ((thd->options & OPTION_SAFE_UPDATES) && limit == HA_POS_ERROR) + if (safe_update && !using_limit) { delete select; table->time_stamp=save_time_stamp; |