summaryrefslogtreecommitdiff
path: root/storage/xtradb/dict
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2014-02-03 10:08:15 +0200
committerJan Lindström <jplindst@mariadb.org>2014-02-03 10:08:15 +0200
commit8c5d5bc5de135ed143bfe91c99fd53a8c9b4487c (patch)
treecd274b3c051b562a306072d4ba9be6e9d7587752 /storage/xtradb/dict
parentfebe99ec8d6b30236982a127fd5d194a7deceb44 (diff)
downloadmariadb-git-8c5d5bc5de135ed143bfe91c99fd53a8c9b4487c.tar.gz
Fixed merge error on InnoDB page compression level handling.
Merged page compression feature to XtraDB storage engine. Added feature where page compression can use lz4 compression method (innodb_use_lz4, default OFF).
Diffstat (limited to 'storage/xtradb/dict')
-rw-r--r--storage/xtradb/dict/dict0dict.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/xtradb/dict/dict0dict.cc b/storage/xtradb/dict/dict0dict.cc
index a20456fe3cf..d6a05d2b214 100644
--- a/storage/xtradb/dict/dict0dict.cc
+++ b/storage/xtradb/dict/dict0dict.cc
@@ -2,6 +2,7 @@
Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2012, Facebook Inc.
+Copyright (c) 2013, SkySQL Ab. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software