summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-02-0351-1345/+2116
|\
| * MDEV-16896 encryption.innodb-checksum-algorithm crashesMarko Mäkelä2019-02-032-24/+18
| * Merge 10.1 into 10.1Marko Mäkelä2019-02-0257-1524/+2328
| |\
| | * MDEV-18016: Assertion failure on ALTER TABLE after foreign_key_checks=0Marko Mäkelä2019-01-292-68/+48
| | * MDEV-18256 Duplicated call to dict_foreign_remove_from_cache()Marko Mäkelä2019-01-292-10/+26
| | * MDEV-18222: Duplicated call to dict_foreign_remove_from_cache()Marko Mäkelä2019-01-292-8/+8
| | * Fix xtradb version after mergeOleksandr Byelkin2019-01-291-1/+1
| | * MariaDB detect incorrect table nameOleksandr Byelkin2019-01-292-2/+3
| | * Fix detection of version in tokudbOleksandr Byelkin2019-01-281-1/+1
| | * Merge branch 'merge-tokudb-5.6' into 10.0Oleksandr Byelkin2019-01-2834-1069/+1776
| | |\
| | | * 5.6.42-84.2Oleksandr Byelkin2019-01-2435-1075/+1778
| | * | Version fix after mergeOleksandr Byelkin2019-01-281-1/+1
| | * | Reverting part of da34c7de5dacac85c4dc1f714bcd7edf3b7fe5f9 that was already f...Oleksandr Byelkin2019-01-281-3/+0
| | * | Merge branch 'merge-xtradb-5.6' into 10.0Oleksandr Byelkin2019-01-283-14/+41
| | |\ \
| | | * | 5.6.42-84.2Oleksandr Byelkin2019-01-248-26/+99
| | * | | Squashed commit of connect/10.0:Olivier Bertrand2019-01-2516-350/+426
| * | | | Fix embedded innodb_plugin after 560799ebd8efe11f4c4ae1bb9ed4d39185e03800Marko Mäkelä2019-02-022-2/+10
* | | | | Merge 10.1 into 10.2Marko Mäkelä2019-02-026-80/+166
|\ \ \ \ \ | |/ / / /
| * | | | Minor clean-upMarko Mäkelä2019-02-012-13/+7
| * | | | Merge branch '10.0-galera' into 10.1Oleksandr Byelkin2019-01-316-57/+159
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/10.0' into bb-10.0-galeraJan Lindström2018-10-31301-195396/+5029
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-10-3012-89/+326
| | |\ \ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62Jan Lindström2018-10-2915-84/+168
| | | |\ \ \ \ \
| | | * | | | | | MariaDB adjustments.Jan Lindström2018-10-102-8/+22
| | | * | | | | | Fix compilation error in row0ins.cVasil Dimov2018-10-101-1/+3
| | | * | | | | | Add a new config variable wsrep_certification_rulesVasil Dimov2018-10-102-3/+16
| | | * | | | | | Generalize "bool shared/exclusive" argument to enumVasil Dimov2018-10-106-52/+123
| | | * | | | | | Merge tag 'mariadb-5.5.61' into 5.5-galeraJan Lindström2018-08-0123-55/+256
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge tag 'mariadb-10.0.36' into 10.0-galeraJan Lindström2018-08-0289-1449/+1229
| | |\ \ \ \ \ \ \ \
* | | | | | | | | | | MDEV-18194 Incremental prepare tries to access page which is out of tablespac...Thirunarayanan Balathandayuthapani2019-02-012-5/+27
* | | | | | | | | | | MDEV-18415 mariabackup.mdev-14447 test case fails with Table 'test.t' doesn't...Thirunarayanan Balathandayuthapani2019-02-012-0/+29
* | | | | | | | | | | MDEV-16849 Extending indexed VARCHAR column should be instantaneousThirunarayanan Balathandayuthapani2019-01-301-1/+2
* | | | | | | | | | | Merge pull request #1142 from codership/10.2-MDEV-15740Jan Lindström2019-01-281-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MDEV-15740 Backport wsrep recovery fixes from 10.4.Teemu Ollakka2019-01-251-0/+8
* | | | | | | | | | | | MDEV-18235: Changes related to fsync()Eugene Kosov2019-01-252-85/+54
|/ / / / / / / / / / /
* | | | | | | | | | | MDEV-15114: Fix memory leaksMarko Mäkelä2019-01-242-4/+5
* | | | | | | | | | | Update the InnoDB version numberMarko Mäkelä2019-01-231-1/+1
* | | | | | | | | | | Bug #22990029 GCOLS: INCORRECT BEHAVIOR AFTER DATA INSERTED WITH IGNORE KEYWORDAditya A2019-01-234-8/+23
* | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2019-01-238-75/+48
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2019-01-234-16/+22
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | * | | | | | | | | Bug#28867993: POSSIBLE ISSUE WITH MYSQL SERVER RESTARTSergei Golubchik2019-01-232-0/+7
| | * | | | | | | | | MDEV-18349 InnoDB file size changes are not safe when file system crashesMarko Mäkelä2019-01-234-48/+47
| * | | | | | | | | | MDEV-17933 slow server status - dict_sys_get_size()Marko Mäkelä2019-01-234-61/+25
* | | | | | | | | | | Remove references to removed dict_sys->sizeMarko Mäkelä2019-01-231-11/+2
* | | | | | | | | | | Remove unnecessary type castsMarko Mäkelä2019-01-231-4/+6
* | | | | | | | | | | MDEV-12747 - main.mysqld_option_err fails in buildbot with timeoutSergey Vojtovich2019-01-221-8/+10
* | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2019-01-182-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | MDEV-18237 InnoDB: Unable to drop FTS index aux table and further errors (pos...Marko Mäkelä2019-01-182-4/+8
* | | | | | | | | | | MDEV-18289 - Fix a race between thd_destructor_proxy() startup andVladislav Vaintroub2019-01-171-2/+3
* | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2019-01-1715-67/+60
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /