summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\
| | | | * WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-021-6/+7
| | | |/
* | | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-2/+2
* | | | 10.0-base mergeSergei Golubchik2013-12-161-0/+2
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-151-0/+2
| |\ \ \ | | |/ /
| | * | install embedded_priv.h in ${INSTALL_INCLUDEDIR}/privateSergei Golubchik2013-12-061-0/+2
* | | | Embedded server with authenticaction fixed after connection attributes port.unknown2013-10-081-4/+6
* | | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-0/+1
|\ \ \ \ | |/ / /
| * | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETESergey Petrunya2013-10-151-0/+1
| |\ \ \
| | * | | MDEV-3798: EXPLAIN UPDATE/DELETESergey Petrunya2013-10-051-1/+1
| | * | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-08-241-0/+1
| | |\ \ \
| | | * \ \ [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-06-271-0/+1
| | | |\ \ \
| | | | * | | SHOW EXPLAIN UPDATE/DELETESergey Petrunya2013-06-171-0/+1
* | | | | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-153-4/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 5.5->10.0-baseIgor Babaev2013-10-141-0/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | MDEV-5131 create_embedded_thd is not thread safe, libmysqld.Alexey Botchkov2013-10-141-0/+2
| * | | | | | Merge 5.5->10.0-baseIgor Babaev2013-10-131-0/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-5131 create_embedded_thd is not thread safe, libmysqld.Alexey Botchkov2013-10-131-0/+2
| * | | | | | A follow-up for the previous commit:Alexander Barkov2013-10-022-0/+2