| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -3/+25 |
| |\ |
|
| | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -3/+3 |
| | |\ |
|
| | | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -7/+14 |
| | | |\ |
|
| | | | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -7/+14 |
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-07-13 | 1 | -0/+22 |
| | |\ \ \
| | |/ / |
|
| | | * | | Add more diagnostic to find out the problem on | Jan Lindström | 2016-07-04 | 1 | -0/+22 |
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 2 | -75/+118 |
| |\ \ \ \
| |/ / / |
|
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -27/+3 |
| | |\ \ \
| | |/ / |
|
| | | * | | Merge branch 'merge-xtradb-5.6' into 0.0 | Sergei Golubchik | 2016-06-21 | 1 | -38/+27 |
| | | |\ \
| | | |/ |
|
| | | | * | 5.6.30-76.3 | Sergei Golubchik | 2016-06-21 | 1 | -39/+28 |
| | * | | | Merged following change from MySQL 5.6 to MariaDB 10.1 XtraDB | Jan Lindström | 2016-05-06 | 1 | -16/+24 |
| | * | | | Merge branch 'bb-10.1-merge' into 10.1 | Sergei Golubchik | 2016-05-05 | 1 | -18/+11 |
| | |\ \ \ |
|
| | | * \ \ | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -18/+11 |
| | | |\ \ \
| | | |/ / |
|
| | | | * | | Improve error diagnostics on I/O errors. If node->name is NULL | Jan Lindström | 2016-04-22 | 1 | -4/+9 |
| | * | | | | MDEV-9362: InnoDB tables using DATA_DIRECTORY created using | Jan Lindström | 2016-05-03 | 1 | -12/+47 |
| | |/ / / |
|
| | * | | | MDEV-9242: Innodb reports Assertion failure in file buf0dblwr.cc line 579 | Jan Lindström | 2016-04-29 | 1 | -2/+33 |
| * | | | | Fixed compiler warnings | Monty | 2016-06-22 | 1 | -6/+6 |
| |/ / / |
|
| * | | | MDEV-9977: Crash when accessing large (>4G) InnoDB table on | Jan Lindström | 2016-04-28 | 1 | -5/+3 |
| * | | | MDEV-9678: Data Directory bug | Jan Lindström | 2016-03-22 | 1 | -1/+4 |
| * | | | MDEV-9640: Add used key_id to INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION | Jan Lindström | 2016-03-18 | 1 | -1/+2 |
| * | | | Add check to avoid NULL-pointer access if encryption information | Jan Lindström | 2016-03-13 | 1 | -3/+3 |
| * | | | MDEV-9549: Trying to decrypt a not encrypted page | Jan Lindström | 2016-03-12 | 1 | -8/+24 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -19/+140 |
| |\ \ \
| |/ / |
|
| | * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 1 | -19/+140 |
| | |\ \
| | |/ |
|
| | | * | 5.6.28-76.1 | Sergei Golubchik | 2016-02-16 | 1 | -19/+140 |
| * | | | MDEV-9559: Server without encryption configs crashes if selecting from an imp... | Jan Lindström | 2016-02-17 | 1 | -5/+10 |
| * | | | MDEV-9359: encryption.create_or_replace fails sporadically in buildbot: faili... | Jan Lindström | 2016-01-05 | 1 | -9/+17 |
| * | | | MDEV-9040: 10.1.8 fails after upgrade from 10.0.21 | Jan Lindström | 2015-11-05 | 1 | -5/+8 |
| * | | | MDEV-9000: storage/xtradb/fil/fil0pagecompress.cc fails to compile on i686-linux | Jan Lindström | 2015-10-28 | 1 | -3/+7 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -4/+5 |
| |\ \ \
| |/ / |
|
| | * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-10-09 | 1 | -4/+5 |
| | |\ \
| | |/ |
|
| | | * | 5.6.26-74.0 | Sergei Golubchik | 2015-10-09 | 1 | -4/+5 |
| | | * | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+6699 |
| * | | MDEV-8901: InnoDB: Punch hole is incorrecty done also to log files causing as... | Jan Lindström | 2015-10-06 | 1 | -2/+4 |
| * | | MDEV-8832: Encryption meta data should not be stored when ENCRYPTED=DEFAULT a... | Jan Lindström | 2015-09-23 | 1 | -2/+10 |
| * | | MDEV-8817: Failing assertion: new_state->key_version != ENCRYPTION_KEY_VERSIO... | Jan Lindström | 2015-09-22 | 1 | -9/+23 |
| * | | MDEV-8770: Incorrect error message when importing page compressed tablespace | Jan Lindström | 2015-09-22 | 3 | -26/+98 |
| * | | MDEV-8773: InnoDB innochecksum does not work with encrypted or page compresse... | Jan Lindström | 2015-09-19 | 1 | -11/+0 |
| * | | MDEV-8772: Assertion failure in file ha_innodb.cc line 20027 when importing p... | Jan Lindström | 2015-09-14 | 2 | -5/+23 |
| * | | MDEV-8708: InnoDB temp file encryption | Jan Lindström | 2015-09-08 | 2 | -56/+89 |
| * | | MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least o... | Jan Lindström | 2015-09-04 | 1 | -24/+42 |
| * | | MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least one ... | Jan Lindström | 2015-09-04 | 1 | -12/+32 |
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -2/+2 |
| |\ \
| |/ |
|
| | * | Code cleanup. | Jan Lindström | 2015-07-14 | 1 | -2/+2 |
| * | | Merge /my/maria-10.1-default into 10.1 | Monty | 2015-08-18 | 1 | -1/+2 |
| |\ \ |
|
| | * | | Fixed failing tests and compiler warnings | Monty | 2015-08-18 | 1 | -1/+2 |
| * | | | MDEV-8589: Non-default ENCRYPTION_KEY_ID is ignored upon reading a table | Jan Lindström | 2015-08-14 | 1 | -3/+7 |
| * | | | MDEV-8583: Empty lines in encryption logging | Jan Lindström | 2015-08-08 | 1 | -1/+1 |
| |/ / |
|
| * | | MDEV-8522: InnoDB: Assertion failure in file fil0fil.cc line 475 | Jan Lindström | 2015-07-22 | 1 | -4/+7 |
| * | | MDEV-8501: encryption.create_or_replace fails in buildbot on P8 builders | Jan Lindström | 2015-07-21 | 1 | -0/+6 |
