diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 12:46:14 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-16 12:46:14 +0200 |
| commit | 9859d366b5dede25308b562c24316c44a6474275 (patch) | |
| tree | 0b39ae57f5bf3f4f69c070d65d0db6e7b14c407c /storage/xtradb/sync | |
| parent | a65162a396b1c298687992dd62ece924978b4c29 (diff) | |
| parent | 90849456d794aa6df32554a588da5db8cb15f5aa (diff) | |
| download | mariadb-git-9859d366b5dede25308b562c24316c44a6474275.tar.gz | |
Merge branch 'merge-xtradb-5.6' into 10.0
Diffstat (limited to 'storage/xtradb/sync')
| -rw-r--r-- | storage/xtradb/sync/sync0sync.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/sync/sync0sync.cc b/storage/xtradb/sync/sync0sync.cc index 942a3e356e5..cfd8f27c389 100644 --- a/storage/xtradb/sync/sync0sync.cc +++ b/storage/xtradb/sync/sync0sync.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by |