diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 09:40:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 09:40:39 +0200 |
| commit | df563e0c037f9b2cdb22e145575f92a121b4b529 (patch) | |
| tree | 31d39796cebcef916eb7e0888537c18f946170ff /storage/innobase/include/mtr0mtr.h | |
| parent | e058a251c10350f3727ca1df022dc5786933535b (diff) | |
| parent | bdfe2784d5b73a1fdcdacb3d9adcc9dc71af344b (diff) | |
| download | mariadb-git-df563e0c037f9b2cdb22e145575f92a121b4b529.tar.gz | |
Merge 10.2 into 10.3
main.derived_cond_pushdown: Move all 10.3 tests to the end,
trim trailing white space, and add an "End of 10.3 tests" marker.
Add --sorted_result to tests where the ordering is not deterministic.
main.win_percentile: Add --sorted_result to tests where the
ordering is no longer deterministic.
Diffstat (limited to 'storage/innobase/include/mtr0mtr.h')
| -rw-r--r-- | storage/innobase/include/mtr0mtr.h | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/storage/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h index 0c157cb87cf..c1281af2b30 100644 --- a/storage/innobase/include/mtr0mtr.h +++ b/storage/innobase/include/mtr0mtr.h @@ -2,7 +2,7 @@ Copyright (c) 1995, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2017, MariaDB Corporation +Copyright (c) 2013, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -35,12 +35,6 @@ Created 11/26/1995 Heikki Tuuri /** Start a mini-transaction. */ #define mtr_start(m) (m)->start() -/** Start a synchronous mini-transaction */ -#define mtr_start_sync(m) (m)->start(true) - -/** Start an asynchronous read-only mini-transaction */ -#define mtr_start_ro(m) (m)->start(true, true) - /** Commit a mini-transaction. */ #define mtr_commit(m) (m)->commit() @@ -198,21 +192,8 @@ struct mtr_t { ~mtr_t() { } - /** Start a mini-transaction. - @param sync true if it is a synchronous mini-transaction */ - void start(bool sync = true); - - /** @return whether this is an asynchronous mini-transaction. */ - bool is_async() const - { - return(!m_sync); - } - - /** Request a future commit to be synchronous. */ - void set_sync() - { - m_sync = true; - } + /** Start a mini-transaction. */ + void start(); /** Commit the mini-transaction. */ void commit(); @@ -558,9 +539,6 @@ private: /** LSN at commit time */ volatile lsn_t m_commit_lsn; - - /** true if it is synchronous mini-transaction */ - bool m_sync; }; #include "mtr0mtr.ic" |