summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* This is the consolidated patch for mdev-8646:bb-10.2-mdev8646Igor Babaev2016-02-092-2/+2
* Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-293426-299635/+717086
|\
| * MDEV-9128 - Compiling on IBM System Z failsSergey Vojtovich2015-12-271-1/+1
| * Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linu...Vladislav Vaintroub2015-12-241-4/+3
| * remove HA_ERR_INFO, use ER_ALTER_INFOSergei Golubchik2015-12-231-1/+2
| * Don't send error 0 to my_printf_error()Monty2015-12-232-5/+6
| * Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-228-77/+237
| |\
| | * MDEV-8869: Potential lock_sys->mutex deadlockbb-10.0-galera-janJan Lindström2015-12-218-27/+164
| | * Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-193418-299829/+718234
| | |\
| | * | MDEV-9162 : MariaDB Galera Cluster memory leak on async slave nodeNirbhay Choubey2015-12-142-15/+22
| | * | MDEV-8869: Potential lock_sys->mutex deadlockJan Lindström2015-12-148-62/+81
| * | | innodb/xtradb: init scrub mutex even in read-only modeSergei Golubchik2015-12-212-12/+12
| * | | update disabled.def for connect engineSergei Golubchik2015-12-211-1/+1
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-213363-298603/+710039
| |\ \ \
| | * | | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state)Sergei Golubchik2015-12-211-1/+1
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-212-5/+5
| | |\ \ \
| | | * | | 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
| | | * | | MDEV-7526: TokuDB doesn't build on OS XVicențiu Ciorbaru2015-12-191-1/+3
| | * | | | MDEV-9088 Server crashes on shutdown after the second post of feedback reportSergei Golubchik2015-12-191-30/+0
| | | |_|/ | | |/| |
| | * | | after-merge disable unstable testsSergei Golubchik2015-12-162-0/+10
| | * | | after merge fix debian buildsSergei Golubchik2015-12-151-1/+1
| | * | | after-merge fix replication testsSergei Golubchik2015-12-1538-510/+946
| | * | | after-merge fix partitioning testsSergei Golubchik2015-12-1518-38/+32
| | * | | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2015-12-153234-297566/+707367
| | |\ \ \
| | | * | | 5.6.26-74.0Sergei Golubchik2015-10-261716-0/+473464
| | | / /
| | * | | MDEV-8297: information_schema.innodb_sys_tablestats.modified_counter doesn't ...Jan Lindström2015-12-152-0/+12
| | * | | MDEV-8721 AIX: Compile error xtradb:log0log.ccAlexander Barkov2015-12-152-2/+2
| | * | | MDEV-8923: port innodb_buffer_pool_dump_pct from MySQLJan Lindström2015-12-158-6/+190
| | * | | MDEV-9276: MySQL Bug #78754: FK definitions missing from SHOW CREATE TABLE in...Jan Lindström2015-12-1412-256/+332
| | * | | Fix logic around retrying failed Windows async IO as synchronous IO . os_file...Vladislav Vaintroub2015-12-141-34/+6
| | * | | fix compile error on WindowsVladislav Vaintroub2015-12-142-2/+2
| | * | | Merge branch 'kentoku/10.0' into 10.0Sergei Golubchik2015-12-1323-286/+1462
| | |\ \ \
| | | * | | merge spider-3.2.37Kentoku SHIBA2015-10-2923-286/+1462
| | * | | | Merge branch 'connect/10.0' into 10.0Sergei Golubchik2015-12-1348-1100/+7783
| | |\ \ \ \
| | | * | | | - Copy error message from G to g when using temporary storage for parsing.Olivier Bertrand2015-12-131-1/+9
| | | * | | | Update version numberOlivier Bertrand2015-12-111-2/+2
| | | * | | | - Serialize: Protect again eventual longjmp's.Olivier Bertrand2015-12-084-84/+140
| | | * | | | Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-3/+4
| | | * | | | Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-6/+12
| | | * | | | Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-510/+506
| | | * | | | Commit updating CONNECT from the 10.1 versionOlivier Bertrand2015-12-0450-1057/+7733
| | | * | | | PATCH-P0-FIX-UPSTREAM: Fix possible buffer overflow (MDEV-8317)Olivier Bertrand2015-11-081-7/+9
| | * | | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-135-8/+45
| | |\ \ \ \ \
| | | * | | | | 5.6.28Sergei Golubchik2015-12-135-8/+45
| | * | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2015-12-1332-240/+618
| | |\ \ \ \ \ \
| | | * | | | | | 5.6.27-76.0Sergei Golubchik2015-12-1333-254/+620
| | * | | | | | | Merge branch 'merge/merge-innodb-5.6' into 10.0Sergei Golubchik2015-12-1311-83/+388
| | |\ \ \ \ \ \ \
View Lorry Controller Status