diff options
| author | unknown <serg@sergbook.mysql.com> | 2007-03-24 17:16:53 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2007-03-24 17:16:53 +0200 |
| commit | 99d1dee47301ba8313dd6fadeaabedcf60c38d27 (patch) | |
| tree | b9c03afd33f12eacdee1a66fbe3bd8f2a850b5dd /sql/handler.cc | |
| parent | aa42093553ad7b066b96ca3e49facc02b6b8981e (diff) | |
| parent | 79bfd0b958f4bade19e0f49ae379b6502cc145fe (diff) | |
| download | mariadb-git-99d1dee47301ba8313dd6fadeaabedcf60c38d27.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
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 524f47209dc..302c1773a9f 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, |