summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-02-2366-3111/+4034
|\
| * connect engine compiler warningsSergei Golubchik2016-02-182-4/+4
| * Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-1772-3014/+3666
| |\
| | * fix InnoDB on WindowsSergei Golubchik2016-02-171-0/+7
| | * Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-02-1627-2557/+2678
| | |\
| | | * - Fix to MDEV-9542 Connect was not handling NULLs in the answerOlivier Bertrand2016-02-1510-2490/+2520
| | | * - Change SQL_NTS to 0 when the string is NULLOlivier Bertrand2016-01-258-17/+82
| | | * - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB SchemaOlivier Bertrand2016-01-098-42/+61
| | | * - Fix MDEV-9322.Olivier Bertrand2015-12-271-2/+2
| | | * - Fix MDEV-9279. Replacing exit(1) in yy_fatal_error by a longjmp.Olivier Bertrand2015-12-142-6/+13
| | * | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2016-02-162-3/+4
| | |\ \
| | | * | 5.6.29Sergei Golubchik2016-02-161-2/+3
| | * | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-02-1616-119/+443
| | |\ \ \
| | | * | | 5.6.28-76.1Sergei Golubchik2016-02-1616-119/+447
| | * | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-02-1618-158/+503
| | |\ \ \ \
| | | * | | | 5.6.29Sergei Golubchik2016-02-1617-155/+437
| | * | | | | Revert "MDEV-8696: Adding indexes on empty table is slow with large innodb_so...Sergei Golubchik2016-02-1612-190/+42
| | * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-0/+2
| | |\ \ \ \ \
| | | * | | | | compilation errors on sparc sun studio 10Sergei Golubchik2016-02-151-0/+2
| | | * | | | | 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-9424: Server crashes when slave works with partitioned tables copied fro...Jan Lindström2016-02-151-9/+63
| * | | | | | | | | MDEV-9548: Alter table (renaming and adding index) fails with "Incorrect key ...Jan Lindström2016-02-156-34/+146
| |/ / / / / / / /
| * | | | | | | | MDEV-9351 Fix CPU detection for TokuDB on FreeBSDSergei Golubchik2016-02-151-7/+4
| * | | | | | | | XtraDB/InnoDB crash with autoinc, vcol and online alterSergei Golubchik2016-02-152-4/+8
| * | | | | | | | Use C++ linkage.Jan Lindström2016-02-044-5/+0
| * | | | | | | | Fix function visibility as it is used on row0mysql.c in Windows.Jan Lindström2016-02-034-4/+32
| * | | | | | | | MDEV-9471: Server crashes or returns an error while trying to alter partition...Jan Lindström2016-02-032-0/+100
* | | | | | | | | MDEV-9550 COUNT(NULL) returns incorrect result with sequence storage engineSergei Golubchik2016-02-233-3/+18
* | | | | | | | | SphinxSE: add support for json filteringOliver Giles2016-02-224-7/+54
* | | | | | | | | Added regression test for MDEV_5871Andrew McDonnell2016-02-174-1/+209
* | | | | | | | | MDEV-9559: Server without encryption configs crashes if selecting from an imp...Jan Lindström2016-02-1714-91/+177
* | | | | | | | | Fixes needed to compile with musl C libraryMonty2016-02-073-4/+8
* | | | | | | | | Fixed warnings and one memory loss found by valgrindMonty2016-02-022-13/+4
* | | | | | | | | MDEV-8724 Assertion `rc == 0' failed in ma_decrypt on reading an Aria tablemariadb-10.1.11Monty2016-01-281-28/+38
* | | | | | | | | compiler warningsSergei Golubchik2016-01-272-2/+2
* | | | | | | | | Fixed MDEV-9347 Not all rows returned by the C APIMonty2016-01-272-1/+17
* | | | | | | | | Merge branch '10.1' of http://github.com/MariaDB/server into 10.1Vladislav Vaintroub2016-01-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | A clean-up patch for Item_func_conv_charset (needed for MDEV-9181)Alexander Barkov2016-01-261-1/+1
* | | | | | | | | | Fix invalid format warningsVladislav Vaintroub2016-01-262-2/+2
|/ / / / / / / / /
* | | | | | | | | after merge fixesSergei Golubchik2016-01-252-4/+4
* | | | | | | | | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2016-01-259-43/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB SchemaOlivier Bertrand2016-01-098-42/+61
| * | | | | | | | | - Fix MDEV-9322.Olivier Bertrand2015-12-271-1/+1
* | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-01-256-2/+6
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |