diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
| commit | 16e15e69523c5aebd6642a47b216f736cfd456a2 (patch) | |
| tree | 81fd0ce6bdc321649671cd1240deb0d5b1248e49 /sql/sql_delete.cc | |
| parent | 4b67a11d2bf201e273be79054b26e90ada15be38 (diff) | |
| parent | 3701208a2e890d42aabc678a2a5d4ea539941b36 (diff) | |
| download | mariadb-git-16e15e69523c5aebd6642a47b216f736cfd456a2.tar.gz | |
Manual merge from next-mr.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index e446c54beef..1d1f673d126 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -92,7 +92,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, } const_cond= (!conds || conds->const_item()); - safe_update=test(thd->options & OPTION_SAFE_UPDATES); + safe_update=test(thd->variables.option_bits & OPTION_SAFE_UPDATES); if (safe_update && const_cond) { my_message(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE, @@ -617,7 +617,7 @@ multi_delete::initialize_tables(JOIN *join) Unique **tempfiles_ptr; DBUG_ENTER("initialize_tables"); - if ((thd->options & OPTION_SAFE_UPDATES) && error_if_full_join(join)) + if ((thd->variables.option_bits & OPTION_SAFE_UPDATES) && error_if_full_join(join)) DBUG_RETURN(1); table_map tables_to_delete_from=0; |