summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
| |\ \ \ \
| | * | | | 5.6.32-78.1Sergei Golubchik2016-09-2773-3715/+4192
| * | | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-09-271-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-09-2720-83/+280
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | 5.6.32-78.1Sergei Golubchik2016-09-2720-80/+280
| * | | | | | Merge branch 'merge/merge-innodb-5.6' into 10.0Sergei Golubchik2016-09-278-13/+98
| |\ \ \ \ \ \
| | * | | | | | 5.6.33Sergei Golubchik2016-09-277-12/+97
| * | | | | | | Fix tokudb jemalloc linkingVicențiu Ciorbaru2016-09-201-2/+1
| * | | | | | | Fix compilation failure of TokuDB on BSD-like systemsVicențiu Ciorbaru2016-09-131-0/+6
| * | | | | | | MDEV-10707: Fix tokudb test rows-32m-rand-insert (#231)Daniel Black2016-09-071-0/+1
* | | | | | | | MDEV-10649: Optimizer sometimes use "index" instead of "range" access for UPDATESergei Petrunia2016-09-282-20/+38
|/ / / / / / /
* | | | | | | MDEV-10341: InnoDB: Failing assertion: mutex_own(mutex) - mutex_exit_funcVicențiu Ciorbaru2016-08-232-18/+2
* | | | | | | Added new status variables to make it easier to debug certain problems:Monty2016-08-214-0/+16
* | | | | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-08-14235-3395/+2920
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-08-1034-1708/+962
| |\ \ \ \ \ \ \
| | * | | | | | | - JdbcInterface: change return type of ...Field functionOlivier Bertrand2016-08-107-33/+54
| | * | | | | | | Change jdbc test to reflect girls.txt LF endingOlivier Bertrand2016-07-152-2/+2
| | * | | | | | | All changes made on 10.1 for last 11 commitsOlivier Bertrand2016-07-1433-1677/+910
| * | | | | | | | Merge branch 'merge/merge-tokudb-5.6' into 10.0Sergei Golubchik2016-08-1035-79/+153
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | 5.6.31-77.0Sergei Golubchik2016-08-1035-79/+153
| * | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-10147-1555/+1623
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | 5.6.31-77.0Sergei Golubchik2016-08-10149-1564/+1631
| * | | | | | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-08-102-6/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | 5.6.32Sergei Golubchik2016-08-101-5/+11
| * | | | | | | | Merge branch 'merge/merge-innodb-5.6' into 10.0Sergei Golubchik2016-08-108-22/+108
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | 5.6.32Sergei Golubchik2016-08-107-21/+107
| * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-08-109-25/+62
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | 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-10535: ALTER TABLE causes standalone/wsrep cluster crashJan Lindström2016-08-132-6/+6
* | | | | | | | | MDEV-10469: innodb.innodb-alter-tempfile fails in buildbot: InnoDB: Warning: ...Jan Lindström2016-08-132-94/+96
|/ / / / / / / /
* | | | | | | | fixes for tokudb_parts --big suiteSergei Golubchik2016-07-1211-3134/+2910
* | | | | | | | MDEV-10261 fix some tokudb partition test result files since the underlying t...Rik Prohaska2016-07-1211-2836/+2682
* | | | | | | | json_udf slowdownSergei Golubchik2016-07-121-2/+2
* | | | | | | | Add more diagnostic to find out the problem onJan Lindström2016-07-046-4/+84
* | | | | | | | remove incorrect .gitattributesSergei Golubchik2016-06-281-25/+0
* | | | | | | | Fixed testcase check failure after db938.testmariadb-10.0.26Sergey Vojtovich2016-06-232-0/+2