diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-02 19:43:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-02 19:57:59 +0200 |
| commit | f69a3b2e920a9409d33c0f36227cb42b1ec5a332 (patch) | |
| tree | 13e5bd572f1eab1ce42405d182862c2066bf2b68 /storage/xtradb/srv | |
| parent | f694df6ac534e9e8396f9c9a7cae3768efc88311 (diff) | |
| download | mariadb-git-f69a3b2e920a9409d33c0f36227cb42b1ec5a332.tar.gz | |
After-merge fix for commit d4df7bc9b1fbdfb5c98134091a9ff998af60954f
The merge omitted some InnoDB and XtraDB conflict resolutions,
most notably, failing to merge the fix of MDEV-12173.
ibuf_merge_or_delete_for_page(), lock_rec_block_validate():
Invoke fil_space_acquire_silent() instead of fil_space_acquire().
This fixes MDEV-12173.
wsrep_debug, wsrep_trx_is_aborting(): Removed unused declarations.
_fil_io(): Remove. Instead, declare default parameters for the XtraDB
fil_io().
buf_read_page_low(): Declare default parameters, and clean up some
callers.
os_aio(): Correct the macro that is defined when !UNIV_PFS_IO.
Diffstat (limited to 'storage/xtradb/srv')
| -rw-r--r-- | storage/xtradb/srv/srv0srv.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc index b0bf526a47e..02314db6b07 100644 --- a/storage/xtradb/srv/srv0srv.cc +++ b/storage/xtradb/srv/srv0srv.cc @@ -82,9 +82,6 @@ Created 10/8/1995 Heikki Tuuri /* prototypes for new functions added to ha_innodb.cc */ ibool innobase_get_slow_log(); -#ifdef WITH_WSREP -extern int wsrep_trx_is_aborting(void *thd_ptr); -#endif /* The following counter is incremented whenever there is some user activity in the server */ UNIV_INTERN ulint srv_activity_count = 0; |