summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorSujatha <sujatha.sivakumar@mariadb.com>2020-09-29 16:59:36 +0530
committerSujatha <sujatha.sivakumar@mariadb.com>2020-09-29 16:59:36 +0530
commit25ede13611b3c1f736be22fc581a0c371d212f61 (patch)
tree0a930e742c1f80786b573067bfed9014c8c54ce8 /sql/handler.h
parent080522dcd7177a0008824802cd58a36ee8048d8f (diff)
parent79e32e47a11150839ac4ab44ac02d4019c0e0019 (diff)
downloadmariadb-git-25ede13611b3c1f736be22fc581a0c371d212f61.tar.gz
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h
index ada5fbf40d4..e06b6a7aa43 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -5179,7 +5179,7 @@ int ha_change_key_cache(KEY_CACHE *old_key_cache, KEY_CACHE *new_key_cache);
/* transactions: interface to handlerton functions */
int ha_start_consistent_snapshot(THD *thd);
int ha_commit_or_rollback_by_xid(XID *xid, bool commit);
-int ha_commit_one_phase(THD *thd, bool all, bool rw_trans);
+int ha_commit_one_phase(THD *thd, bool all);
int ha_commit_trans(THD *thd, bool all);
int ha_rollback_trans(THD *thd, bool all);
int ha_prepare(THD *thd);