diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-09-17 12:38:22 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2007-09-17 12:38:22 +0200 |
| commit | cbcc5bb60354a8436c1d23e560c20d660877d8f2 (patch) | |
| tree | 27d7a9a4f32afbf68deb65143071769a79487261 /sql/sql_update.cc | |
| parent | 36906fb724c0df18a91f384c634e422b45be0c12 (diff) | |
| parent | 9f8b990b31a0dd323e43c78bd30b910695b31f87 (diff) | |
| download | mariadb-git-cbcc5bb60354a8436c1d23e560c20d660877d8f2.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_update.cc:
Auto merged
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 d4df805d006..2a469220fa7 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -797,7 +797,7 @@ int mysql_update(THD *thd, Sometimes we want to binlog even if we updated no rows, in case user used it to be sure master and slave are in same state. */ - if ((error < 0) || (updated && !transactional_table)) + if ((error < 0) || thd->transaction.stmt.modified_non_trans_table) { if (mysql_bin_log.is_open()) { |