Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add mtr support files for tokudb_sys_vars tests | Rik Prohaska | 2016-11-02 | 3 | -0/+16 |
* | MDEV-10408 run the tokudb_rpl.rpl_rfr_disable_on_expl_pk_absence test. Add c... | Rik Prohaska | 2016-11-02 | 3 | -3/+2 |
* | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 96 | -552/+4318 |
|\ | |||||
| * | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 182 | -4366/+8922 |
| |\ | |||||
| | * | MDEV-10292: Tokudb - PerconaFT - compile error in recent gcc | Daniel Black | 2016-10-26 | 1 | -2/+0 |
| | * | Fix build error in XtraDB on Windows. | Vladislav Vaintroub | 2016-10-26 | 1 | -0/+9 |
| | * | Merge branch 'connect/10.0' into 10.0 | Sergei Golubchik | 2016-10-25 | 9 | -271/+196 |
| | |\ | |||||
| | | * | - Fix MDEV-10950. Null values not retrieved for numeric types. | Olivier Bertrand | 2016-10-14 | 3 | -15/+29 |
| | | * | - Fix MDEV-10948. Syntax error on quoted JDBC tables. | Olivier Bertrand | 2016-10-05 | 3 | -4/+42 |
| | | * | - Working on MDEV-10525. Lrecl mismatch on DBF files | Olivier Bertrand | 2016-09-16 | 3 | -20/+74 |
| | | * | Merge branch '10.0' of https://github.com/MariaDB/server into ob-10.0 | Olivier Bertrand | 2016-09-05 | 635 | -13000/+24368 |
| | | |\ | |||||
| | | * | | - Fix MDEV-10496. Memory leak in discovery | Olivier Bertrand | 2016-09-05 | 5 | -247/+54 |
| | * | | | Merge branch 'merge/merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 43 | -162/+1108 |
| | |\ \ \ | |||||
| | | * | | | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 40 | -160/+1105 |
| | * | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 38 | -86/+2940 |
| | |\ \ \ \ | |||||
| | | * | | | | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 38 | -85/+2892 |
| | * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | compilation warning after xtradb mergemariadb-5.5.53 | Sergei Golubchik | 2016-10-14 | 1 | -1/+1 |
| | | * | | | | | Merge branch 'merge-xtradb-5.5' into 5.5 | Sergei Golubchik | 2016-10-13 | 11 | -50/+179 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | 5.5.52-38.3 | Sergei Golubchik | 2016-10-13 | 11 | -46/+179 |
| | * | | | | | | | MDEV-10983: TokuDB does not compile on OS X 10.12 | Vicențiu Ciorbaru | 2016-10-25 | 4 | -3/+20 |
| | * | | | | | | | MDEV-5944: Compile fix for OQGRAPH with LLVM | Don Lewis | 2016-10-25 | 2 | -22/+28 |
* | | | | | | | | | MDEV-11182: InnoDB: Assertion failure in file buf0buf.cc line 4730 (encryptio... | Jan Lindström | 2016-10-31 | 2 | -10/+75 |
* | | | | | | | | | MDEV-11106: Improve error messages when importing tablespaces | Jan Lindström | 2016-10-29 | 2 | -0/+18 |
* | | | | | | | | | MDEV-10917: Warning suggesting that innodb_page_size is experimental may be i... | Jan Lindström | 2016-10-29 | 2 | -10/+13 |
* | | | | | | | | | MDEV-11004: Unable to start (Segfault or os error 2) when encryption key missing | Jan Lindström | 2016-10-29 | 6 | -44/+83 |
* | | | | | | | | | MDEV-10977: [ERROR] InnoDB: Block in space_id 0 in file ibdata1 encrypted. | Jan Lindström | 2016-10-29 | 2 | -107/+240 |
* | | | | | | | | | Merge pull request #250 from sensssz/10.1-vats | Jan Lindström | 2016-10-26 | 10 | -266/+692 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | A few fixes for VATS in 10.1 | sensssz | 2016-10-25 | 10 | -266/+692 |
* | | | | | | | | | | MDEV-10970: Crash while loading mysqldump backup when InnoDB encryption is en... | Jan Lindström | 2016-10-24 | 2 | -2/+12 |
* | | | | | | | | | | Merge pull request #245 from sensssz/10.1-vats | Jan Lindström | 2016-10-24 | 6 | -32/+407 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Move the lock after deadlock is resolved. | sensssz | 2016-10-13 | 2 | -22/+30 |
| * | | | | | | | | | Get thd by lock->trx->mysql_thd. | sensssz | 2016-10-12 | 2 | -2/+2 |
| * | | | | | | | | | Reduce conflict during in-order replication. | sensssz | 2016-10-12 | 2 | -0/+30 |
| * | | | | | | | | | Bug fix: add * and ; for innodb | sensssz | 2016-10-11 | 1 | -2/+2 |
| * | | | | | | | | | Bug fix: missing * and ; | sensssz | 2016-10-11 | 1 | -2/+2 |
| * | | | | | | | | | Bug fix: add undeclared variables. | sensssz | 2016-10-11 | 1 | -0/+3 |
| * | | | | | | | | | Implement VATS both in InnoDB and XtraDB. Add configuration options for it in... | sensssz | 2016-10-11 | 6 | -28/+362 |
* | | | | | | | | | | Add more information if encryption information is already stored for | Jan Lindström | 2016-10-24 | 2 | -2/+16 |
* | | | | | | | | | | Remove unnecessary semicolons | Hyeonseok Oh | 2016-10-24 | 3 | -3/+3 |
* | | | | | | | | | | Revert "Prepare XtraDB to be used with xtrabackup." | Vladislav Vaintroub | 2016-10-23 | 10 | -127/+16 |
* | | | | | | | | | | Prepare XtraDB to be used with xtrabackup. | Vladislav Vaintroub | 2016-10-22 | 10 | -16/+127 |
|/ / / / / / / / / | |||||
* | | | | | | | | | MDEV-10041: Server crashes sporadically during bootstrap while running wsrep ... | Nirbhay Choubey | 2016-09-28 | 1 | -1/+2 |
* | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 104 | -3804/+4575 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch '10.0' of github.com:MariaDB/server into 10.0 | Sergei Petrunia | 2016-09-28 | 105 | -3807/+4579 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'merge/merge-tokudb-5.6' into 10.0 | Sergei Golubchik | 2016-09-27 | 73 | -3708/+4192 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
| | | * | | | | | | | 5.6.32-78.1 | Sergei Golubchik | 2016-09-27 | 73 | -3715/+4192 |
| | * | | | | | | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-09-27 | 20 | -83/+280 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | 5.6.32-78.1 | Sergei Golubchik | 2016-09-27 | 20 | -80/+280 |