summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.0' into 10.1Alexander Barkov2018-06-191-32/+187
|\
| * Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2018-06-191-32/+187
| |\
| | * MDEV-15113: Hang in Aria loghandlerOleksandr Byelkin2018-06-121-32/+187
* | | MDEV-15611 Due to the failure of foreign key detection, Galera slave node kil...Jan Lindström2018-06-152-132/+150
* | | MDEV-13103 Deal with page_compressed page corruptionMarko Mäkelä2018-06-1424-2005/+955
* | | MDEV-13103: Improve 'cannot be decrypted' error messageMarko Mäkelä2018-06-132-4/+4
* | | Remove traces of the non-working MDEV-6354Marko Mäkelä2018-06-136-20/+10
* | | Correct a typo in a commentMarko Mäkelä2018-06-132-2/+2
* | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-128-61/+67
|\ \ \
| * \ \ Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-07195-2159/+3098
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-0718-95/+92
| |\ \ \ \
| | * \ \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-2458-396/+291
| | |\ \ \ \
| | * | | | | MDEV-8743: protect myisam/aria MYI with O_CLOEXECDaniel Black2018-03-022-4/+4
| | * | | | | MDEV-8743: O_CLOEXEC on innodb/xtradb temp filesDaniel Black2018-03-022-0/+8
| | * | | | | MDEV-8743: protect myisam/aria MYD files and aria log filesDaniel Black2018-03-024-8/+8
| | * | | | | MDEV-8743: use O_CLOEXEC (innodb/xtradb)Daniel Black2018-03-022-6/+6
| | * | | | | Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-1944-156/+218
| | |\ \ \ \ \
| | * | | | | | MW-402 cascading FK issues (5.5 version)sjaakola2017-10-192-7/+6
| | * | | | | | Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-1929-43/+61
| | |\ \ \ \ \ \
| | * | | | | | | Remove unneeded code.mariadb-galera-5.5.57Jan Lindström2017-07-242-36/+0
| | * | | | | | | Apply galera patches to XtraDB storage engine and remove one debug output.Jan Lindström2017-07-244-20/+33
| | * | | | | | | Fix regression on galera.partition test case by commenting the problematic co...Jan Lindström2017-07-241-3/+12
| | * | | | | | | MDEV-10379: Failing assertion: xid_seqno > trx_sys_cur_xid_seqnoJan Lindström2017-07-242-40/+0
| | * | | | | | | MW-369 FK fixessjaakola2017-07-201-1/+3
| | * | | | | | | MW-322 Fix compilation error with debug buildTeemu Ollakka2017-07-201-2/+1
| | * | | | | | | Fix merge error and compiler warning.Jan Lindström2017-07-201-8/+5
| | * | | | | | | MW-369 - merged fix for FK issue from 5.6-v25 branchsjaakola2017-07-201-8/+13
| | * | | | | | | MW-322 - CTAS fix merged to 5.5-v25 branchsjaakola2017-07-201-27/+35
| | * | | | | | | Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-2039-230/+272
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add tokudb_bugs test to disabled.mariadb-galera-5.5.56Sachin Setiya2017-05-031-1/+1
| | * | | | | | | | Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-032-4/+4
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-1840-775/+668
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix compiler error on gcc 6.x and most of the compiler warnings.Jan Lindström2017-04-0557-195/+37
| | * | | | | | | | | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-273-19/+43
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | MDEV-10544: Galera: Failing assertion: (lock->trx)->wait_lock == lockJan Lindström2016-11-092-2/+0
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-1411-50/+179
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-1024-75/+158
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-2323-514/+655
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-2513-64/+103
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-1317-111/+175
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Refs codership/mysql-wsrep#221sjaakola2016-02-101-0/+4
| | * | | | | | | | | | | | | | | | Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-1028-492/+588
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-1315-97/+320
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-1231-143/+136
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-125-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | MDEV-16342 SHOW ENGINES: MyISAM description is uselessSergei Golubchik2018-06-115-5/+5
| * | | | | | | | | | | | | | | | | | | MDEV-16456 InnoDB error "returned OS error 71" complains about wrong pathMarko Mäkelä2018-06-122-6/+40
| * | | | | | | | | | | | | | | | | | | Ensure TokuDB compiles both on Linux and OS XVicențiu Ciorbaru2018-06-112-34/+34
| * | | | | | | | | | | | | | | | | | | Followup for make TokuDB compile with GCC-8Vicențiu Ciorbaru2018-06-101-2/+2
| * | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-104-7/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
View Lorry Controller Status