summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-243-2/+9
|\
| * Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-213-2/+9
| |\
| | * Fixed compilation failure using clangVicențiu Ciorbaru2016-06-141-1/+2
| | * MDEV-10166 probes_mysql_nodtrace.h is not provided anymore by mariadb-10.0.25Sergei Golubchik2016-06-141-0/+6
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-1/+1
| | |\
| | | * BUG#22594514: HANDLE_FATAL_SIGNAL (SIG=11) INNisha Gopalakrishnan2016-03-171-2/+2
| | | * WL#9072: Backport WL#8785 to 5.5Ramil Kalimullin2016-02-193-5/+27
| | * | MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows.Vladislav Vaintroub2016-06-081-1/+1
* | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-292-2/+2
|\ \ \ \ | |/ / /
| * | | Update AskMonty and Atlassian references to MariaDBiangilfillan2016-03-081-1/+1
| * | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-1/+1
* | | | Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-236-21/+14
|\ \ \ \ | |/ / /
| * | | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-173-18/+7
| |\ \ \
| | * | | MDEV-9308 Fix build errors with recent gcc (isfinite)Sergei Golubchik2016-02-171-0/+3
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-153-18/+4
| | |\ \ \ | | | |/ /
| | | * | dtrace in cmakeSergei Golubchik2016-02-151-0/+0
| | | * | better inline checkSergei Golubchik2016-02-151-14/+0
| | | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-3/+3
| | | |\ \ | | | | |/
| | | | * Updated copyright year in user visible textBjorn Munch2016-01-111-2/+2
| | | | * Bug#21770366 backport bug#21657078 to 5.5 and 5.6Ajo Robert2016-01-071-8/+4
| | | | * Bug #21221862 NEWEST RHEL/CENTOS OPENSSL UPDATE BREAKS MYSQL DHE CIPHERSV S Murthy Sidagam2015-06-191-2/+2
| | | | * Raise version number after cloning 5.5.42Bala2015-01-051-2/+2
| | | * | MDEV-9024 Build fails with VS2015Sergei Golubchik2016-02-061-0/+2
| | | * | MDEV-9466 : Exception handler on Windows does not output any text,Vladislav Vaintroub2016-02-031-1/+1
| * | | | MDEV-9511 Valgrind warnings 'Invalid read' in Field_newdate::cmp and Field_ne...Alexander Barkov2016-02-171-1/+1
| |/ / /
| * | | Merge MDEV-9112 into 10.0Kristian Nielsen2016-02-011-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-9112: Non-blocking client API missing on non-x86 platformsGeorg Richter2016-02-011-1/+1
| * | | MDEV-9366 : do_shutdown_server fails to detect server shutdown on Windows.Vladislav Vaintroub2016-01-071-1/+1
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-211-0/+4
| |\ \ \ | | |/ /
| | * | MDEV-9249 MariaDB un-buildable on linux64: fails @ "error: ‘ERR_remove_stat...Sergei Golubchik2015-12-211-0/+4
* | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-197-6/+14
|\ \ \ \ | |/ / /
| * | | MDEV-8378 - Debian: the Lintian complains about many "shlib-calls-exit" in manymariadb-10.0.23Sergey Vojtovich2015-12-161-2/+1
| * | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-132-0/+3
| |\ \ \
| | * | | 5.6.28Sergei Golubchik2015-12-132-0/+3
| * | | | Correct comments before mysql_socket_{g|s}etfd to refer to the right functionDaniel Black2015-12-111-2/+2
| * | | | Fixed failing test cases and compiler warnings found by buildbotMonty2015-11-241-0/+4
| * | | | MDEV-9024 Build fails with VS2015Vladislav Vaintroub2015-11-062-2/+4
* | | | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-319-21/+30
|\ \ \ \ \ | |/ / / /
| * | | | remove unneded #include's that had a dubious explanationSergei Golubchik2015-10-241-0/+8
| * | | | MDEV-8379 - SUSE mariadb patchesSergey Vojtovich2015-10-014-13/+13
| * | | | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()Oleksandr Byelkin2015-09-064-8/+8
| * | | | Fixed overrun in key cache if one tried to allocate a key cacheMonty2015-08-131-0/+1
* | | | | Add close-on-exec flag to open(), socket(), accept() & fopen().Nirbhay Choubey2015-06-242-1/+29
* | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-219-63/+3
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-7398 mysqld segfaults on FreeBSD 10.1 i386 when built with clang 3.4Sergei Golubchik2015-06-162-4/+3
| * | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-117-59/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | MDEV-8052 abi detection incorrect with clangSergei Golubchik2015-06-037-47/+0
* | | | | Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-097-80/+34
|\ \ \ \ \ | |/ / / /
| * | | | perfschema 5.6.24Sergei Golubchik2015-05-055-79/+32
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 5.6.24Sergei Golubchik2015-05-045-79/+32