MariaDB server is a community developed fork of MySQL server. Started by core members of the original MySQL team, MariaDB actively works with outside developers to deliver the most featureful, stable, and sanely licensed open SQL server in the industry.
Find a file
Sergei Golubchik 5dffda3ccc Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg
With changes:

* update tests to pass (new encryption/encryption_key_id syntax).
* not merged the code that makes engine aware of the encryption mode
  (CRYPT_SCHEME_1_CBC, CRYPT_SCHEME_1_CTR, storing it on disk, etc),
  because now the encryption plugin is handling it.
* compression+encryption did not work in either branch before the
  merge - and it does not work after the merge. it might be more
  broken after the merge though - some of that code was not merged.
* page checksumming code was not moved (moving of page checksumming
  from fil_space_encrypt() to fil_space_decrypt was not merged).
* restored deleted lines in buf_page_get_frame(), otherwise
  innodb_scrub test failed.
2015-04-09 19:27:40 +02:00
BUILD MDEV-6650 - LINT_INIT emits code in non-debug builds 2015-03-16 14:48:22 +04:00
client MDEV-6650 - LINT_INIT emits code in non-debug builds 2015-03-16 14:48:22 +04:00
cmake rename "encryption key management plugin" to "encryption plugin" 2015-04-09 18:42:43 +02:00
dbug MDEV-6410 Cross-compile fixes 2014-07-08 19:34:53 +02:00
debian MDEV-7874 deb package installation fails with "dpkg: dependency problems prevent configuration of mariadb-server" 2015-03-30 01:09:59 +03:00
Docs MDEV-6247: Merge 10.0-galera to 10.1. 2014-08-26 15:43:46 +03:00
extra InnoDB/XtraDB Encryption cleanup. 2015-04-07 23:44:56 +02:00
include remove now-empty my_aes.{h,cc} 2015-04-09 18:42:44 +02:00
libmysql MDEV-6650 - LINT_INIT emits code in non-debug builds 2015-03-16 14:48:22 +04:00
libmysqld renames to follow single consistent naming style 2015-04-09 18:42:44 +02:00
libservices renames to follow single consistent naming style 2015-04-09 18:42:44 +02:00
man Merge 10.0.14 into 10.1 2014-10-15 12:59:13 +02:00
mysql-test Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
mysys small cleanup 2015-04-08 10:58:49 +02:00
mysys_ssl remove now-empty my_aes.{h,cc} 2015-04-09 18:42:44 +02:00
packaging Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
pcre pcre-8.36 2014-11-20 17:09:51 +01:00
plugin renames to follow single consistent naming style 2015-04-09 18:42:44 +02:00
randgen/conf Group commit for maria engine. 2010-02-12 15:12:28 +02:00
scripts MDEV-6069: Remove old logic for 3.23-to-higher upgrades from upgrade SQL scripts 2015-03-19 09:47:20 -04:00
sql remove now-empty my_aes.{h,cc} 2015-04-09 18:42:44 +02:00
sql-bench Merge branch '10.0' into merge-wip 2015-01-31 21:48:47 +01:00
sql-common MDEV-6650 - LINT_INIT emits code in non-debug builds 2015-03-16 14:48:22 +04:00
storage Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
strings MDEV-7677 my_charset_handler_filename has a wrong "ismbchar" member 2015-03-23 17:38:55 +04:00
support-files Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
tests remove a google specific script 2015-04-08 10:58:47 +02:00
unittest MDEV-7437 remove suport for "atomics" with rwlocks 2015-01-13 10:15:21 +01:00
vio Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
win Merge branch '10.0' into 10.1 2015-03-07 13:21:02 +01:00
wsrep compiler warnings 2015-01-31 21:51:45 +01:00
zlib Backport from trunk: 2014-05-07 17:09:14 +02:00
.gitattributes Fix the tree to work in git. Backport corresponing 10.1 changes. 2015-02-10 12:26:21 +01:00
.gitignore Fix the tree to work in git. Backport corresponing 10.1 changes. 2015-02-10 12:26:21 +01:00
BUILD-CMAKE various documentation updates 2012-06-18 16:57:58 -04:00
CMakeLists.txt remove one cmake MESSAGE 2015-04-05 13:14:37 +02:00
config.h.cmake MDEV-6479 stack traces in 10.1 2015-02-28 19:48:22 +01:00
configure.cmake MDEV-6479 stack traces in 10.1 2015-02-28 19:48:22 +01:00
COPYING Use a new version of "COPYING", the GPL text. 2010-03-04 14:26:27 +01:00
COPYING.LESSER MWL#192: non-blocking client API, after-review fixes. 2012-01-06 12:43:18 +01:00
COPYING.thirdparty split README into the actual README and third-party licenses 2014-05-24 18:23:46 +02:00
CREDITS Updated sponsors and authors 2014-03-28 09:31:43 +02:00
EXCEPTIONS-CLIENT MDEV-5645 MariaDB-5.5.35 - references are made to an "EXCEPTIONS-CLIENT" file but it does not exist 2014-05-31 13:18:56 +02:00
INSTALL-SOURCE Merging the changes for Bug 16633169 - MYSQL.INFO CONTAINS OUTDATED INFORMATION. 2013-04-16 12:17:18 +02:00
INSTALL-WIN-SOURCE Merging the changes for Bug 16633169 - MYSQL.INFO CONTAINS OUTDATED INFORMATION. 2013-04-16 12:17:18 +02:00
KNOWN_BUGS.txt various documentation updates 2012-06-18 16:57:58 -04:00
README split README into the actual README and third-party licenses 2014-05-24 18:23:46 +02:00
VERSION Increased the version number 2015-03-30 01:11:14 +03:00

MariaDB is designed as a drop-in replacement of MySQL(R) with more
features, new storage engines, fewer bugs, and better performance.

MariaDB is brought to you by the MariaDB foundation.
Please read the file CREDITS for details about the MariaDB foundation,
and who is developing MariaDB.

MariaDB is developed by many of the original developers of MySQL who
now work for MariadB foundation and SkySQL Ab, and by many people in
the community.

MySQL, which is the base of MariaDB, is a product and trademark of Oracle
Corporation, Inc. For a list of developers and other contributors,
see the Credits appendix.  You can also do 'SHOW authors' to get a
list of active contributors.

A description of the MariaDB project and a manual can be found at:
http://mariadb.org/
https://mariadb.com/kb/en/
https://mariadb.com/kb/en/mariadb-vs-mysql-features/
https://mariadb.com/kb/en/mariadb-versus-mysql-features/
https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/

As MariaDB is a full replacement of MySQL, the MySQL manual at
http://dev.mysql.com/doc is generally applicable.

More help is available from the Maria Discuss mailing list
https://launchpad.net/~maria-discuss
and the #maria IRC channel on Freenode.

***************************************************************************

NOTE: 

MariaDB is specifically available only under version 2 of the GNU
General Public License (GPLv2). (I.e. Without the "any later version"
clause.) This is inherited from MySQL. Please see the README file in
the MySQL distribution for more information.

License information can be found in the COPYING, COPYING.LESSER,
and COPYING.thirdparty files.

***************************************************************************

IMPORTANT:

Bug and/or error reports regarding MariaDB should be submitted at
http://mariadb.org/jira

Bugs in the MySQL code can also be submitted at http://bugs.mysql.com

The code for MariaDB, including all revision history, can be found at:
https://github.com/MariaDB/server

***************************************************************************