diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-04-08 08:42:34 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-04-08 08:42:34 +0000 |
| commit | df8bf3a88ab4c778730187586f8f068a7ba00a8e (patch) | |
| tree | e5ea779a565c6a3d07ea5dc9af6bd182f9409f81 /databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc | |
| parent | editors/emacs: (diff) | |
Fix patches that were accidentally concatenated twice in r412695.
Reported by: Vladimir Omelchuk <admin@vladiom.com.ua>
Pointy hat to: dim
PR: 208525
MFH: 2016Q2
Diffstat (limited to 'databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc')
| -rw-r--r-- | databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc b/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc index 30d9d2d06b99..e73f8d216ba0 100644 --- a/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc +++ b/databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc @@ -9,14 +9,3 @@ Files; typedef OSMutex Mutex; ---- storage/innobase/sync/sync0debug.cc.orig 2015-11-29 19:16:24 UTC -+++ storage/innobase/sync/sync0debug.cc -@@ -1704,7 +1704,7 @@ private: - const void*, - File, - std::less<const void*>, -- ut_allocator<std::pair<const void*, File> > > -+ ut_allocator<std::pair<const void* const, File> > > - Files; - - typedef OSMutex Mutex; |