summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows.Vladislav Vaintroub2016-01-072-3/+4
* Fix annoying repetitive tokudb build warning, if MariaDB is build on non-Linu...Vladislav Vaintroub2016-01-071-4/+3
* Fixed bug in semi_sync replication tests.Monty2016-01-039-14/+37
* Cleanup of slave code:Monty2016-01-039-22/+77
* Backported fix for ccacheMonty2016-01-037-4/+19
* Merge branch '5.5' into 10.0Vladislav Vaintroub2015-12-301-5/+5
|\
| * Fix process handle leak in buildbot. GenerateConsoleCtrlEvent sent to non-ex...Vladislav Vaintroub2015-12-301-5/+5
* | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2015-12-291-5/+5
|\ \ | |/
| * Moving Field_blob::store_length() back from protected to public,Alexander Barkov2015-12-291-5/+5
* | Merge branch '10.0' of github.com:MariaDB/server into 10.0Alexander Barkov2015-12-292-2/+2
|\ \
| * | MDEV-9128 - Compiling on IBM System Z failsSergey Vojtovich2015-12-291-1/+1
| * | MDEV-9128 - Compiling on IBM System Z failsSergey Vojtovich2015-12-291-1/+1
* | | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2015-12-2910-14/+152
|\ \ \ | |/ / |/| / | |/
| * MDEV-9319 ALTER from a bigger to a smaller blob type truncates too much dataAlexander Barkov2015-12-2910-14/+152
* | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state)Sergei Golubchik2015-12-212-1/+5
* | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-215-6/+15
|\ \ | |/
| * MDEV-9249 MariaDB un-buildable on linux64: fails @ "error: ‘ERR_remove_stat...Sergei Golubchik2015-12-213-1/+10
| * 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-1912-55/+1
* | MDEV-7384: Add --persistent option for mysqlcheckDaniel Black2015-12-184-8/+58
* | Filter out unix-socket from unrelated test casesSergey Vojtovich2015-12-183-5/+5
* | Fixed auth_socket static compilationSergey Vojtovich2015-12-182-2/+2
* | MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in manymariadb-10.0.23Sergey Vojtovich2015-12-164-7/+2
* | MDEV-9167: COLUMN_CHECK fails on valid decimal dataOleksandr Byelkin2015-12-163-1/+29
* | 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-1547-552/+958
* | after-merge fix partitioning testsSergei Golubchik2015-12-1526-38/+48
* | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2015-12-153235-297591/+707393
|\ \
| * | 5.6.26-74.0Sergei Golubchik2015-10-262948-0/+2652528
| /
* | MDEV-9147: Character set is ignored in Dynamic Column for saved stringOleksandr Byelkin2015-12-153-5/+24
* | MDEV-8297: information_schema.innodb_sys_tablestats.modified_counter doesn't ...Jan Lindström2015-12-155-0/+61
* | 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-1510-6/+244
* | MDEV-9265 SuSE patches: Suspicious implicit sign extensionAlexander Barkov2015-12-151-1/+1
* | MDEV-9276: MySQL Bug #78754: FK definitions missing from SHOW CREATE TABLE in...Jan Lindström2015-12-1414-256/+464
* | 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
|\ \ \
| * \ \ Merge branch 'ob-10.0' into 10.0Olivier Bertrand2015-12-131-1/+9
| |\ \ \
| | * | | - Copy error message from G to g when using temporary storage for parsing.Olivier Bertrand2015-12-131-1/+9
| * | | | Merge branch 'ob-10.0' into 10.0Olivier Bertrand2015-12-111-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Update version numberOlivier Bertrand2015-12-111-2/+2
| * | | | Commiting merge from ob-10.0Olivier Bertrand2015-12-0951-1125/+7860
| |\ \ \ \ | | |/ / /