diff options
author | Alfranio Correia <alfranio.correia@oracle.com> | 2010-12-03 01:06:56 +0000 |
---|---|---|
committer | Alfranio Correia <alfranio.correia@oracle.com> | 2010-12-03 01:06:56 +0000 |
commit | f077bda60680f953d92e886cd8f214ebd3810874 (patch) | |
tree | 17b03034adacba5198daf59764421d0d94a325d9 /sql/log.h | |
parent | 651d029e99006a59806d391aa4f04d4946c6d5d7 (diff) | |
parent | bf2c66d4a7281c1d7dbf49cbad315c7041762670 (diff) | |
download | mariadb-git-f077bda60680f953d92e886cd8f214ebd3810874.tar.gz |
merge mysql-5.5-bugteam(local) --> mysql-5.5-bugteam
Diffstat (limited to 'sql/log.h')
-rw-r--r-- | sql/log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index d824d3afa26..4857f478cdf 100644 --- a/sql/log.h +++ b/sql/log.h @@ -415,7 +415,7 @@ public: bool write_incident(THD *thd, bool lock); int write_cache(IO_CACHE *cache, bool lock_log, bool flush_and_sync); - void set_write_error(THD *thd); + void set_write_error(THD *thd, bool is_transactional); bool check_write_error(THD *thd); void start_union_events(THD *thd, query_id_t query_id_param); |