summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-24519-9856/+29771
|\
| * Fixed testcase check failure after db938.testmariadb-10.0.26Sergey Vojtovich2016-06-232-0/+2
| * Merge following commit from 5.5:Jan Lindström2016-06-2314-42/+68
| * compilation failuresSergei Golubchik2016-06-221-2/+2
| * MDEV-9479: Enable OQGRAPH Engine to compile with Boost-1.60+Dimitri John Ledkov2016-06-221-1/+1
| * Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-22512-9766/+29691
| |\
| | * Fixed for failures in buildbot: TokuDBSergei Golubchik2016-06-221-0/+2
| | * Fixed for failures in buildbot: ReplicationSergei Golubchik2016-06-221-8/+0
| | * Fixed for failures in buildbot: WindowsSergei Golubchik2016-06-221-2/+2
| | * Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-06-2141-236/+8781
| | |\
| | | * Merge branch '10.0' of https://github.com/MariaDB/server into 10.0Olivier Bertrand2016-06-201-36/+0
| | | |\
| | | * | - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-1318-11/+1144
| | | * | git90.msg + git91.msgOlivier Bertrand2016-06-0213-74/+2039
| | | * | - New version of the java JdbcInterfaceOlivier Bertrand2016-05-232-78/+151
| | | * | Merge branch '10.0' of https://github.com/MariaDB/server into 10.0Olivier Bertrand2016-05-223574-301371/+719517
| | | |\ \
| | | * | | - Fix wrong return from ExecuteQueryOlivier Bertrand2016-05-212-2/+2
| | | * | | Commit changes made from 10.1Olivier Bertrand2016-05-215-332/+453
| | | * | | Add forgotten changes made on 10.1Olivier Bertrand2016-05-124-12/+26
| | | * | | Add all changes made on 10.1Olivier Bertrand2016-05-1214-159/+5398
| | * | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-21472-9527/+20910
| | |\ \ \ \
| | | * \ \ \ Merge branch 'merge-xtradb-5.6' into 0.0Sergei Golubchik2016-06-2140-1032/+762
| | | |\ \ \ \
| | | | * | | | 5.6.30-76.3Sergei Golubchik2016-06-2140-1006/+765
| | | * | | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-21146-1481/+1541
| | | |\ \ \ \ \
| | | | * | | | | 5.6.31Sergei Golubchik2016-06-21146-1481/+1536
| | | * | | | | | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-2113-480/+543
| | | |\ \ \ \ \ \
| | | | * | | | | | MDEV-10247 TokuDB assertion error when building with DEBUGVicențiu Ciorbaru2016-06-171-3/+12
| | | | * | | | | | 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 branch '10.0-tokudb-merge' into 10.0Sergei Golubchik2016-06-11275-6533/+18063
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | fix tokudb tests after the mergeSergei Golubchik2016-06-1116-48/+50
| | | | * | | | | | | | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-mergeSergei Golubchik2016-06-1195-462/+1355
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | 5.6.30-76.3Sergei Golubchik2016-06-1077-309/+862
| | | | | * | | | | | | | 5.6.29-76.2Sergei Golubchik2016-04-2625-153/+487
| | | | * | | | | | | | | Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-mergeSergei Golubchik2016-06-10217-6169/+16688
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / /
| | | | | * | | | | | | | move mysql-test into storage/tokudb, rename suitesSergei Golubchik2016-04-261264-0/+2182109
| | | | | * | | | | | | | 5.6.28-76.1Sergei Golubchik2016-02-163-8/+5
| | | | | * | | | | | | | 5.6.27-76.0Sergei Golubchik2015-12-1587-5774/+13197
| | | * | | | | | | | | | MDEV-9128 Compiling on IBM System Z failsSergei Golubchik2016-06-111-1/+1
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| * | | | | | | | | | | revert part of 69f1a32Sergei Golubchik2016-06-221-0/+38
| * | | | | | | | | | | Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PL...Vladislav Vaintroub2016-06-212-51/+1
| * | | | | | | | | | | MDEV-10258 - Valgrind warnings in buildbot after a set of mroonga testsSergey Vojtovich2016-06-211-1/+4