diff options
| author | jamppa@bk-internal.mysql.com <> | 2007-04-03 13:55:20 +0200 |
|---|---|---|
| committer | jamppa@bk-internal.mysql.com <> | 2007-04-03 13:55:20 +0200 |
| commit | cbfd66e7548ca0c5893f739727bf774775a59f4a (patch) | |
| tree | 049cfa5e178795e0c9678787541789c9520fa138 /sql/handler.cc | |
| parent | 898ec87e141ca627fe7c8eb2c842dd4ab1ab159f (diff) | |
| parent | 5441aefd1d7b5cbeb1d0874d578482c7a2b054d0 (diff) | |
| download | mariadb-git-cbfd66e7548ca0c5893f739727bf774775a59f4a.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 6cba079e736..6788d21b40f 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -830,7 +830,7 @@ int ha_rollback_trans(THD *thd, bool all) the error log; but we don't want users to wonder why they have this message in the error log, so we don't send it. */ - if (is_real_trans && (thd->options & OPTION_STATUS_NO_TRANS_UPDATE) && + if (is_real_trans && thd->no_trans_update.all && !thd->slave_thread) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARNING_NOT_COMPLETE_ROLLBACK, |