summaryrefslogtreecommitdiff
path: root/sql/log.h
diff options
context:
space:
mode:
authorAlfranio Correia <alfranio.correia@oracle.com>2010-12-03 01:06:56 +0000
committerAlfranio Correia <alfranio.correia@oracle.com>2010-12-03 01:06:56 +0000
commitb28d2c25a71c0be09af0e5f1760d17b70530885f (patch)
tree17b03034adacba5198daf59764421d0d94a325d9 /sql/log.h
parent3ffab566196fb596e91eb9260d791d8578401b16 (diff)
parent3f5a9c7ea03e5c6a62f41bb90f6b1655c59d3d75 (diff)
downloadmariadb-git-b28d2c25a71c0be09af0e5f1760d17b70530885f.tar.gz
merge mysql-5.5-bugteam(local) --> mysql-5.5-bugteam
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h2
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);