summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* | | Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-1024-75/+158
|\ \ \ | |/ /
| * | MDEV-10341: InnoDB: Failing assertion: mutex_own(mutex) - mutex_exit_funcmariadb-5.5.51Vicențiu Ciorbaru2016-08-094-18/+14
| * | MDEV-10506 Protocol::end_statement(): Assertion `0' failed upon ALTER TABLESergei Golubchik2016-08-071-1/+2
| * | Merge branch 'merge/merge-xtradb-5.5' into 5.5Sergei Golubchik2016-08-034-21/+35
| |\ \ | | |/
| | * 5.5.50-38.0Sergei Golubchik2016-08-034-21/+35
| * | MDEV-10217: innodb.innodb_bug59641 fails sporadically in buildbot: InnoDB: Fa...Jan Lindström2016-08-032-0/+40
| * | MDEV-10083: Orphan ibd file when playing with foreign keysJan Lindström2016-06-2312-32/+55
| * | MDEV-10247 TokuDB assertion error when building with DEBUGVicențiu Ciorbaru2016-06-171-3/+12
* | | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-2323-514/+655
|\ \ \ | |/ /
| * | Fix typo bug that cause myisam repair to failmariadb-5.5.50Vicențiu Ciorbaru2016-06-162-3/+3
| * | Fix compilation failure when compiling with std=c90Vicențiu Ciorbaru2016-06-162-7/+5
| * | MDEV-9256 : Crashes on Windows x64 with aria_pagecache_buffer_size > 4GBVladislav Vaintroub2016-06-143-37/+37
| * | MDEV-10229: TokuDB fails to build with CLangVicențiu Ciorbaru2016-06-145-28/+9
| * | MDEV-10162: Update repair testcaseVicențiu Ciorbaru2016-06-142-15/+6
| * | Fixed compilation failure using clangVicențiu Ciorbaru2016-06-143-284/+319
| * | [Code cleanup] Refactor duplicate code within myisam and maria sort.ccVicențiu Ciorbaru2016-06-142-73/+53
| * | Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-06-145-31/+76
| |\ \ | | |/
| | * 5.5.49-37.9Sergei Golubchik2016-06-146-31/+76
| * | MDEV-9994 - Aria service threads are not "joined"Sergey Vojtovich2016-06-104-61/+26
| * | MDEV-7139: Sporadic failure in innodb.innodb_corrupt_bit on P8Jan Lindström2016-06-084-2/+148
* | | Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-2513-64/+103
|\ \ \ | |/ /
| * | Merge branch 'bb-5.5-serg' into 5.5mariadb-5.5.49Sergei Golubchik2016-04-2011-56/+91
| |\ \
| | * \ Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-04-206-27/+60
| | |\ \ | | | |/
| | | * 5.5.48-37.8Sergei Golubchik2016-04-186-19/+62
| | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-205-29/+31
| | |\ \
| | | * | BUG#20574550 MAIN.MERGE TEST CASE FAILS IF BINLOG_FORMAT=ROWVenkatesh Duggirala2016-02-261-1/+3
| | | * | (no commit message)Arun Kuruvila2016-02-231-3/+11
| | | * | (no commit message)Arun Kuruvila2016-02-231-3/+6
| | | * | Bug#22680706: 5.5 DOES NOT BUILD WITH GCC5Jon Olav Hauglid2016-02-082-4/+4
| | | * | Followup:BUG#22530768 Innodb freeze running REPLACE statementsShaohua Wang2016-01-271-23/+23
| | | * | BUG#22530768 Innodb freeze running REPLACE statementsShaohua Wang2016-01-122-17/+21
| * | | | MDEV-9943 - TokuDB fails to compile with gcc 5.2.1Sergey Vojtovich2016-04-201-8/+10
| |/ / /
| * | | compilation errors on sparc sun studio 10Sergei Golubchik2016-02-151-0/+2
* | | | Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-1317-111/+175
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge-xtradb-5.5' into 5.5Sergei Golubchik2016-02-093-4/+18
| |\ \ \ | | | |/ | | |/|
| | * | 5.5.47-37.7Sergei Golubchik2016-02-093-3/+17
| * | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-092-24/+18
| |\ \ \
| | * | | BUG#22530768 Innodb freeze running REPLACE statementsmysql-5.5.48Shaohua Wang2016-01-152-17/+21
| | | |/ | | |/|
| | * | Bug #22214852: MYSQL 5.5 AND 5.6: MAIN.KEY AND OTHERSreeharsha Ramanavarapu2015-11-181-2/+2
| * | | Fix function visibility as it is used on row0mysql.c in Windows.Jan Lindström2016-02-034-2/+30
| * | | MDEV-9471: Server crashes or returns an error while trying to alter partition...Jan Lindström2016-02-032-0/+98
| * | | MDEV-7526: TokuDB doesn't build on OS XDevilSatan2015-12-191-1/+1
| * | | MDEV-7526: TokuDB doesn't build on OS XVicențiu Ciorbaru2015-12-191-3/+1
| * | | MDEV-7526: TokuDB doesn't build on OS XVicențiu Ciorbaru2015-12-191-70/+0
| * | | MDEV-7526: TokuDB doesn't build on OS XVicențiu Ciorbaru2015-12-191-4/+4