summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-191-9/+0
|\
| * Build improvements and cleanups.Vladislav Vaintroub2017-09-081-9/+0
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-07-121-0/+6
| |\
| | * MDEV-10318 : Fix crash in embedded, in case prepared statement has parameter ...Vladislav Vaintroub2016-07-111-0/+6
* | | MDEV-13179 main.errors fails with wrong errnoMonty2017-08-071-2/+1
* | | remove old API for SHA2Sergei Golubchik2017-03-101-1/+1
* | | bugfix: mutex order violation in embeddedSergei Golubchik2017-01-151-1/+1
* | | MDEV-10318 : Fix crash in embedded, in case prepared statement has parameter ...Vladislav Vaintroub2016-07-111-0/+6
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-3/+7
|\ \ \ | |/ /
| * | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-3/+7
| |\ \ | | |/
| | * Restore COMPONENT Embedded for Windows embedded libs.Vladislav Vaintroub2016-05-241-3/+7
* | | Fixed wrong counting of global Memory_usedMonty2016-04-281-0/+3
* | | fix func_hybrid_type crash in --ps --embeddedSergei Golubchik2015-10-151-0/+1
* | | MDEV-6080: Allowing storage engine to shortcut group by queriesMonty2015-10-051-0/+1
* | | MDEV-8865 Wrong field type or metadata for COALESCE(signed_int_column, unsign...Alexander Barkov2015-09-301-0/+1
* | | MDEV-8126 encryption for temp filesSergei Golubchik2015-06-021-1/+1
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-1/+1
|\ \ \ | |/ /
| * | perfschema 5.6.24Sergei Golubchik2015-05-051-1/+1
* | | MDEV-7999 - PROFILING routines take 0.2% when profiling disabledsvoj-gittestSergey Vojtovich2015-05-141-8/+0
* | | Merge branch '10.1' of github.com:MariaDB/server into 10.1Sergei Petrunia2015-04-121-1/+1
|\ \ \
| * | | renames to follow single consistent naming styleSergei Golubchik2015-04-091-1/+1
* | | | MDEV-7836: ANALYZE FORMAT=JSON should provide info about GROUP/ORDER BYSergei Petrunia2015-04-121-0/+1
|/ / /
* | | encryption key management plugin apiSergei Golubchik2015-02-101-1/+1
* | | Push for testing of encryptionMonty2015-02-101-1/+0
* | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-0/+3
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2015-01-211-0/+3
| |\ \ | | |/
| | * mysql-5.5.41 mergeSergei Golubchik2014-12-191-0/+3
| | |\
| | | * Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANGJon Olav Hauglid2014-10-132-0/+14
| | | * Update copyright text.Alexander Nozdrin2014-08-281-0/+3
* | | | Merge branch '10.1' into bb-10.1-mergeSergei Golubchik2014-12-031-0/+1
|\ \ \ \
| * \ \ \ Merge ../10.1 into bb-10.1-explain-jsonSergei Petrunia2014-10-151-0/+1
| |\ \ \ \
| * \ \ \ \ Merge 10.1 (with ANALYZE) and 10.1-explain-jsonSergei Petrunia2014-08-091-0/+1
| |\ \ \ \ \
| | * | | | | MDEV-6109: EXPLAIN JSON10.1-explain-jsonSergei Petrunia2014-05-271-0/+1
* | | | | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
| |/ / / /
* | | | | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-011-0/+1
|/ / / /
* | | | Moving implementation of INET_ATON() INET_NTOA() intoAlexander Barkov2014-05-301-0/+1
|/ / /
* | | 5.5 mergeSergei Golubchik2014-05-093-4/+20
|\ \ \ | |/ /
| * | MDEV-5138 Numerous test failures in "mtr --ps --embedded".Alexey Botchkov2014-04-151-0/+12
| * | MDEV-5138 Numerous test failures in "mtr --ps --embedded".Alexey Botchkov2014-04-151-3/+6
| * | MDEV-5138 Numerous test failures in "mtr --ps --embedded".Alexey Botchkov2014-04-151-1/+1
| * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-0/+1
| |\ \ | | |/
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1
| | * Bug#18123048 ENABLE BUILD OF SHARED LIBMYSQLD ON LINUXTor Didriksen2014-02-041-1/+35
* | | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-042-4/+2
* | | 10.0-base mergeSergei Golubchik2014-02-261-1/+1
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-251-1/+1
| |\ \ \ | | |/ /
| | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-171-1/+1
| | |\ \ | | | |/
| | | * Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTIONTor Didriksen2013-12-181-1/+1
| | | * WL#7076: Backporting wl6715 to support both formats Ashish Agarwal2013-08-231-6/+7
| | | |\