summaryrefslogtreecommitdiff
path: root/storage/xtradb/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-0111-15/+34
|\
| * Merge branch 'Buggynours:10.0' into 10.0Sergei Golubchik2015-05-051-0/+1
| |\
| | * Add #include <ostream> in dict0mem.h and change iterator to const_iterator in...Buggynours2015-03-031-0/+1
| * | XtraDB-5.6.23-72.1Sergei Golubchik2015-05-059-14/+32
| |\ \
| | * | 5.6.23-72.1Sergei Golubchik2015-05-049-13/+31
| | * | move to storage/xtradbSergei Golubchik2015-05-04229-0/+75324
| | /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-1/+1
| |\ \
| | * \ Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2015-04-281-2/+2
| | |\ \
| | | * | percona-server-5.5.42-37.1.tar.gzSergei Golubchik2015-04-281-1/+1
| | | * | move to storage/xtradb/Sergei Golubchik2015-04-27193-0/+57523
| | | /
| | * | MDEV-7434 XtraDB does not build on SolarisSergei Golubchik2015-04-271-1/+1
| | * | XtraDB 5.5.41-37.0Sergei Golubchik2015-02-114-4/+28
| | * | MDEV-7369: MariaDB build fails when XTRADB_STORAGE_ENGINE enabledJan Lindström2014-12-281-2/+2
| | * | Fixed a couple of compiler warnings.Sergey Vojtovich2014-12-191-1/+1
| | * | MDEV-7148 - Recurring: InnoDB: Failing assertion: !lock->recursiveSergey Vojtovich2014-12-011-1/+6
* | | | MDEV-8238: Tables with encryption=yes using file_key_management plugin are no...Jan Lindström2015-05-271-8/+0
* | | | MDEV-8195: InnoDB: Error: trying to access tablespace 11262 page no. 7, InnoD...Jan Lindström2015-05-211-0/+7
* | | | MDEV-8182: Failing assertion: 1 == UT_LIST_GET_LEN(space->chain)Jan Lindström2015-05-201-1/+18
* | | | MDEV-8173: InnoDB; Failing assertion: crypt_data->type == 1Jan Lindström2015-05-201-1/+1
* | | | MDEV-8164: Server crashes in pfs_mutex_enter_func after fil_crypt_is_closing ...Jan Lindström2015-05-181-16/+25
* | | | MDEV-8043 innodb tablespace encryptionSergei Golubchik2015-05-151-6/+5
* | | | Identical key derivation code in XtraDB/InnoDB/AriaSergei Golubchik2015-05-151-9/+1
* | | | MDEV-8143: InnoDB: Database page corruption on disk or a failed file readJan Lindström2015-05-142-1/+71
* | | | MDEV-8041: InnoDB redo log encryptionJan Lindström2015-05-093-74/+43
* | | | Merge 10.0 -> 10.1Kristian Nielsen2015-04-202-0/+12
|\ \ \ \ | |/ / /
| * | | MDEV-7367: Updating a virtual column corrupts table which crashes serverJan Lindström2015-03-312-0/+12
* | | | Merge branch '10.1' into bb-10.1-sergSergei Golubchik2015-04-101-7/+0
|\ \ \ \
| * | | | MDEV-7918: A number of tests fail in valgrind builder with "InnoDB: Error: Re...Jan Lindström2015-04-061-7/+0
* | | | | add support for --innodb-encrypt-tables=FORCESergei Golubchik2015-04-101-1/+1
* | | | | s/innodb_default_encryption_key/innodb_default_encryption_key_id/Sergei Golubchik2015-04-101-3/+0
* | | | | Store the key id in the tablespace and read it backSergei Golubchik2015-04-091-1/+1
* | | | | Add encryption key id to the API as a distinct conceptSergei Golubchik2015-04-093-9/+6
* | | | | Merge branch 'bb-10.1-jan-encryption' into bb-10.1-sergSergei Golubchik2015-04-0917-836/+689
|\ \ \ \ \
| * | | | | InnoDB/XtraDB Encryption cleanupJan Lindström2015-04-073-5/+4
| * | | | | InnoDB/XtraDB Encryption code cleanupJan Lindström2015-04-072-15/+10
| * | | | | Encryption cleanupJan Lindström2015-04-074-4/+72
| * | | | | InnoDB/XtraDB Encryption cleanupJan Lindström2015-04-075-41/+79
| * | | | | InnoDB/XtraDB Encryption cleanup.Jan Lindström2015-04-0713-784/+616
| |/ / / /
* | | | | clarify/simplify new innodb sysvars: innodb-scrub-log-intervalSergei Golubchik2015-04-091-2/+2
* | | | | small cleanups as per reviewSergei Golubchik2015-04-092-30/+1
* | | | | remove now-empty my_aes.{h,cc}Sergei Golubchik2015-04-091-1/+1
* | | | | renames to follow single consistent naming styleSergei Golubchik2015-04-092-4/+4
* | | | | encryption plugin controls the encryptionSergei Golubchik2015-04-091-0/+2
|/ / / /
* | | | Add more information if page state is not correct.Jan Lindström2015-03-101-0/+7
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-076-5/+31
|\ \ \ \ | |/ / /
| * | | MDEV-7148 - Recurring: InnoDB: Failing assertion: !lock->recursiveSergey Vojtovich2015-03-051-1/+6
| | |/ | |/|
| * | MDEV-7623: Add lock wait time and hold time to every record/table lock in Jan Lindström2015-02-241-0/+7
| * | MDEV-7620: Transaction lock wait is missing number of lock Jan Lindström2015-02-231-0/+15
| * | xtradb 5.6.22-72.0Sergei Golubchik2015-02-183-4/+3
* | | MDEV-7109: Add support for INFORMATION_SCHEMA.INNODB_SEMAPHORE_WAITSJan Lindström2015-02-216-57/+102
View Lorry Controller Status