summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Refs: MW-317bb-10.1-galera-ctasNirbhay Choubey2016-11-182-0/+2
* MDEV-10692: InnoDB: Failing assertion: lock->trx->lock.wait_lock == lockJan Lindström2016-11-092-2/+51
* MDEV-10985, MDEV-10986 - sphinx tests have not been maintainedElena Stepanova2016-11-041-0/+2
* fix the tokudb_analyze_in_background_basic test to run on mariadb. mariadb d...Rik Prohaska2016-11-022-11/+15
* add mtr support files for tokudb_sys_vars testsRik Prohaska2016-11-023-0/+16
* MDEV-10408 run the tokudb_rpl.rpl_rfr_disable_on_expl_pk_absence test. Add c...Rik Prohaska2016-11-023-3/+2
* Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-0296-552/+4318
|\
| * Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-28182-4366/+8922
| |\
| | * MDEV-10292: Tokudb - PerconaFT - compile error in recent gccDaniel Black2016-10-261-2/+0
| | * Fix build error in XtraDB on Windows.Vladislav Vaintroub2016-10-261-0/+9
| | * Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-10-259-271/+196
| | |\
| | | * - Fix MDEV-10950. Null values not retrieved for numeric types.Olivier Bertrand2016-10-143-15/+29
| | | * - Fix MDEV-10948. Syntax error on quoted JDBC tables.Olivier Bertrand2016-10-053-4/+42
| | | * - Working on MDEV-10525. Lrecl mismatch on DBF filesOlivier Bertrand2016-09-163-20/+74
| | | * Merge branch '10.0' of https://github.com/MariaDB/server into ob-10.0Olivier Bertrand2016-09-05635-13000/+24368
| | | |\
| | | * | - Fix MDEV-10496. Memory leak in discoveryOlivier Bertrand2016-09-055-247/+54
| | * | | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-10-2543-162/+1108
| | |\ \ \
| | | * | | 5.6.33-79.0Sergei Golubchik2016-10-2540-160/+1105
| | * | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-2538-86/+2940
| | |\ \ \ \
| | | * | | | 5.6.33-79.0Sergei Golubchik2016-10-2538-85/+2892
| | * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-10-251-1/+1
| | |\ \ \ \ \
| | | * | | | | compilation warning after xtradb mergemariadb-5.5.53Sergei Golubchik2016-10-141-1/+1
| | | * | | | | Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-10-1311-50/+179
| | | |\ \ \ \ \
| | | | * | | | | 5.5.52-38.3Sergei Golubchik2016-10-1311-46/+179
| | * | | | | | | MDEV-10983: TokuDB does not compile on OS X 10.12Vicențiu Ciorbaru2016-10-254-3/+20
| | * | | | | | | MDEV-5944: Compile fix for OQGRAPH with LLVMDon Lewis2016-10-252-22/+28
* | | | | | | | | MDEV-11182: InnoDB: Assertion failure in file buf0buf.cc line 4730 (encryptio...Jan Lindström2016-10-312-10/+75
* | | | | | | | | MDEV-11106: Improve error messages when importing tablespacesJan Lindström2016-10-292-0/+18
* | | | | | | | | MDEV-10917: Warning suggesting that innodb_page_size is experimental may be i...Jan Lindström2016-10-292-10/+13
* | | | | | | | | MDEV-11004: Unable to start (Segfault or os error 2) when encryption key missingJan Lindström2016-10-296-44/+83
* | | | | | | | | MDEV-10977: [ERROR] InnoDB: Block in space_id 0 in file ibdata1 encrypted.Jan Lindström2016-10-292-107/+240
* | | | | | | | | Merge pull request #250 from sensssz/10.1-vatsJan Lindström2016-10-2610-266/+692
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | A few fixes for VATS in 10.1sensssz2016-10-2510-266/+692
* | | | | | | | | | MDEV-10970: Crash while loading mysqldump backup when InnoDB encryption is en...Jan Lindström2016-10-242-2/+12
* | | | | | | | | | Merge pull request #245 from sensssz/10.1-vatsJan Lindström2016-10-246-32/+407
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Move the lock after deadlock is resolved.sensssz2016-10-132-22/+30
| * | | | | | | | | Get thd by lock->trx->mysql_thd.sensssz2016-10-122-2/+2
| * | | | | | | | | Reduce conflict during in-order replication.sensssz2016-10-122-0/+30
| * | | | | | | | | Bug fix: add * and ; for innodbsensssz2016-10-111-2/+2
| * | | | | | | | | Bug fix: missing * and ;sensssz2016-10-111-2/+2
| * | | | | | | | | Bug fix: add undeclared variables.sensssz2016-10-111-0/+3
| * | | | | | | | | Implement VATS both in InnoDB and XtraDB. Add configuration options for it in...sensssz2016-10-116-28/+362
* | | | | | | | | | Add more information if encryption information is already stored forJan Lindström2016-10-242-2/+16
* | | | | | | | | | Remove unnecessary semicolonsHyeonseok Oh2016-10-243-3/+3
* | | | | | | | | | Revert "Prepare XtraDB to be used with xtrabackup."Vladislav Vaintroub2016-10-2310-127/+16
* | | | | | | | | | Prepare XtraDB to be used with xtrabackup.Vladislav Vaintroub2016-10-2210-16/+127
|/ / / / / / / / /
* | | | | | | | | MDEV-10041: Server crashes sporadically during bootstrap while running wsrep ...Nirbhay Choubey2016-09-281-1/+2
* | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-28104-3804/+4575
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '10.0' of github.com:MariaDB/server into 10.0Sergei Petrunia2016-09-28105-3807/+4579
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-09-2773-3708/+4192
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |