summaryrefslogtreecommitdiff
path: root/storage/archive
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-06-03 09:55:08 +0200
committerSergei Golubchik <sergii@pisem.net>2014-06-03 09:55:08 +0200
commit5d16592d44d8dd7147ee868c661af842ec0f1568 (patch)
tree57f83c95bf23bdb90bd05e1134ffaaa0e015249f /storage/archive
parent2d687cad5d1154418603a16e58772d91f37d4cbd (diff)
parentc1fd09f3d4848ae59605564ded9628307d59dd27 (diff)
downloadmariadb-git-5d16592d44d8dd7147ee868c661af842ec0f1568.tar.gz
mysql-5.5.38 merge
Diffstat (limited to 'storage/archive')
-rw-r--r--storage/archive/ha_archive.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index e33b1735914..872373bbeb6 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -1,5 +1,6 @@
/*
- Copyright (c) 2004, 2012, Oracle and/or its affiliates
+ Copyright (c) 2004, 2014, Oracle and/or its affiliates
+ Copyright (c) 2010, 2014, SkySQL Ab.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License