diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-03-29 21:11:17 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2007-03-29 21:11:17 +0300 |
| commit | e57c8007a4e2c7d1f8bda44b0af6599126673ef4 (patch) | |
| tree | b931193692f1cf128130b65c64be0083c17e62b0 /sql/sql_update.cc | |
| parent | 0fdd64ba6391e556c3438733cb4f479f2c3395cf (diff) | |
| download | mariadb-git-e57c8007a4e2c7d1f8bda44b0af6599126673ef4.tar.gz | |
Manual merge from 5.0
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index f438e04e6c9..988e81033c7 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -535,7 +535,7 @@ int mysql_update(THD *thd, if (!error) { updated++; - thd->no_trans_update= !transactional_table; + thd->no_trans_update.stmt= !transactional_table; if (table->triggers && table->triggers->process_triggers(thd, TRG_EVENT_UPDATE, |