summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2007-07-31 15:23:25 +0300
committerunknown <gkodinov/kgeorge@magare.gmz>2007-07-31 15:23:25 +0300
commit125bc936ac66ce20898311a20343292b8107e3eb (patch)
treea32fe617148b1f7930fc656c7fb3aad75bfeb99d /sql/handler.cc
parent6c589f90846cbaaeea9f0ff86f4b6011aa8622a9 (diff)
parent21d639e573d483a354c8ddbf17471ee468cce926 (diff)
downloadmariadb-git-125bc936ac66ce20898311a20343292b8107e3eb.tar.gz
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.0-opt sql/handler.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 2285a190c8e..8ef14ce8906 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -833,7 +833,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->no_trans_update.all &&
+ if (is_real_trans && thd->transaction.all.modified_non_trans_table &&
!thd->slave_thread)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_WARNING_NOT_COMPLETE_ROLLBACK,