summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Use standard InnoDB error mechanism on compression and encryptionJan Lindström2015-03-026-258/+329
* fix new innodb warnings to use the standard innodb warning syntaxSergei Golubchik2015-03-014-8/+8
* Reducing duplicate code and simplifying well formed string copyingAlexander Barkov2015-02-271-7/+3
* MDEV-7572: InnoDB: Assertion failure in log_init_crypt_key ifJan Lindström2015-02-262-19/+68
* MDEV-7109: Add support for INFORMATION_SCHEMA.INNODB_SEMAPHORE_WAITSJan Lindström2015-02-2127-292/+1827
* Merged from 10.0-FusionIO:Jan Lindström2015-02-1916-54/+271
* MDEV-7593: Default encryption key does not work correctly for pageJan Lindström2015-02-188-21/+54
* innodb/xtradb: update nonnull attributes to match the new semanticsSergei Golubchik2015-02-172-4/+4
* followup for "MDEV-6248 GUI-friendly cmake options to enable/disable plugins"Sergei Golubchik2015-02-154-21/+14
* Don't link plugins with libmysys.a or libmysys_ssl.aSergei Golubchik2015-02-151-1/+1
* Fix test failure seen on p8-rhel7Jan Lindström2015-02-112-10/+10
* Revert "Fixing ConnectSE compilation warnings"Sergei Golubchik2015-02-101-7/+0
* Fixing ConnectSE compilation warnings (and failires in maintainer mode).Alexander Barkov2015-02-101-0/+7
* Do not yet allow encrypted tables with compressed tables.Jan Lindström2015-02-102-0/+16
* Pass down the information should we encrypt the page at os0file.ccJan Lindström2015-02-1028-249/+425
* Add test case for combination Google encryption and page compressed tables.Jan Lindström2015-02-104-6/+18
* encryption keys serviceSergei Golubchik2015-02-106-6/+0
* encryption key management plugin apiSergei Golubchik2015-02-1012-41/+38
* Fixed XtraDB implementation of encryption and page encryption.Jan Lindström2015-02-1026-926/+330
* Push for testing of encryptionMonty2015-02-10147-1012/+16782
* Merge 10.0-galera into 10.1Sergei Golubchik2015-02-062-6/+39
|\
| * maria-10.0.16 mergeNirbhay Choubey2015-01-26159-929/+7192
| |\
| * | MDEV-7374 : Losing connection to MySQL while running ALTER TABLENirbhay Choubey2015-01-242-48/+56
| * | MDEV-7129 : Galera duplicate error on autoincrement field primary keyNirbhay Choubey2015-01-072-6/+47
| * | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051865-7828/+575826
| |\ \
| * | | MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ctx->wait_...Nirbhay Choubey2014-10-032-6/+0
| * | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281428-28337/+33696
| |\ \ \
| * | | | Fix compiler error when WITH_WSREP is not used.Jan Lindström2014-08-272-19/+15
| * | | | MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRTJan Lindström2014-08-255-186/+269
| * | | | Fix for build failure in tokudb.Nirbhay Choubey2014-08-141-2/+2
| * | | | Merge of innobase changes to xtradb. (r3871..3873).Nirbhay Choubey2014-08-124-57/+144
| * | | | bzr merge -r4104..4120 codership/5.6/Nirbhay Choubey2014-08-124-57/+144
| * | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-11276-4760/+19485
| |\ \ \ \
| * | | | | MDEV-6492: MariaDB Galera Cluster cant use rsync sstNirbhay Choubey2014-07-315-2/+114
| * | | | | Merge -r4105..4106 from codership/5.6Jan Lindström2014-07-044-44/+14
| * | | | | bzr merge -r4091..4101 codership/5.6/Nirbhay Choubey2014-06-1910-70/+140
| * | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-1966-836/+2048
| |\ \ \ \ \
| * | | | | | bzr merge -r4065..4088 codership/5.6Nirbhay Choubey2014-05-214-8/+22
| * | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211914-119843/+141536
| |\ \ \ \ \ \
| * | | | | | | Fix for build failure.Nirbhay Choubey2014-04-151-5/+5
| * | | | | | | Local merge (mariadb-galera-10.0.10).Nirbhay Choubey2014-04-092214-149925/+172737
| |\ \ \ \ \ \ \
| | * | | | | | | Fixes for some test failures.Nirbhay Choubey2014-04-092-2/+10
| | * | | | | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-08742-144248/+150987
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-2718-311/+269
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-2616-407/+320
| | | * | | | | | | | bzr merge -r4021..4026 codership-mysql/5.6.Nirbhay Choubey2014-03-254-44/+68
| | | * | | | | | | | bzr merge -r3946..3968 codership/5.5Nirbhay Choubey2014-03-251-3/+7
| | * | | | | | | | | Merging wsrep specific changes from InnoDB toNirbhay Choubey2014-03-2614-295/+455
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808).Nirbhay Choubey2014-03-2614-329/+484
| | | |/ / / / / / / /
| | * | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261571-9693/+25633
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |