diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-11-01 12:00:11 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-11-01 12:00:11 +0100 |
| commit | 57a267a8c00471bbe13724e7d9ba89d23acef3c2 (patch) | |
| tree | 808a9f9b165bfe034304e4974dd618eaafcdedb2 /sql/rpl_utility.h | |
| parent | bd3dc54261f10f387a03ad99ce74c3824c42e462 (diff) | |
| parent | cb86ce60b9bade5ae7712d8f3f74668208ee3fd2 (diff) | |
| download | mariadb-git-57a267a8c00471bbe13724e7d9ba89d23acef3c2.tar.gz | |
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
The merge is still missing a few hunks related to temporary tables and
InnoDB log file size. The associated code did not seem to exist in
10.0, so the merge of that needs more work. Until this is fixed, there
are a number of test failures as a result.
Diffstat (limited to 'sql/rpl_utility.h')
| -rw-r--r-- | sql/rpl_utility.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_utility.h b/sql/rpl_utility.h index 9ac17f68a1f..1a00a58d453 100644 --- a/sql/rpl_utility.h +++ b/sql/rpl_utility.h @@ -283,7 +283,7 @@ public: /* queue for exection at Query-log-event time prior the Query */ int add(Log_event *ev); bool is_empty(); - bool execute(Relay_log_info *rli); + bool execute(struct rpl_group_info *rgi); void rewind(); bool is_last(Log_event *ev) { return ev == last_added; }; }; |