diff options
| author | unknown <jamppa@bk-internal.mysql.com> | 2007-04-17 15:45:35 +0200 |
|---|---|---|
| committer | unknown <jamppa@bk-internal.mysql.com> | 2007-04-17 15:45:35 +0200 |
| commit | 9340cb193e40516d051f02cdd074dd30b99816a4 (patch) | |
| tree | 87310f47abe960fdb7ddb0d4d388995eb3ce601b /sql/sql_delete.cc | |
| parent | cc76701e8f47ca52ca209150f49ba665a215c1d0 (diff) | |
| parent | 9c0097fa8b4b5adc593797166fcd6f5ea53fca19 (diff) | |
| download | mariadb-git-9340cb193e40516d051f02cdd074dd30b99816a4.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
mysql-test/r/strict.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
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 a2095a8382e..92f38d57330 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -353,7 +353,7 @@ cleanup: } } if (!transactional_table) - thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; + thd->no_trans_update.all= TRUE; } free_underlaid_joins(thd, select_lex); if (transactional_table) @@ -858,7 +858,7 @@ bool multi_delete::send_eof() } } if (!transactional_tables) - thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; + thd->no_trans_update.all= TRUE; } /* Commit or rollback the current SQL statement */ if (transactional_tables) |