summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.5 into 10.6Marko Mäkelä2022-12-131-9/+6
|\
| * Merge 10.4 into 10.5Marko Mäkelä2022-12-131-9/+6
| |\
| | * Merge 10.3 into 10.4Marko Mäkelä2022-12-131-9/+6
| | |\
| | | * fix embedded startup with no command line argumentsSergei Golubchik2022-12-021-9/+6
* | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-10-151-2/+10
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2022-10-131-2/+10
| |\ \ \ | | |/ /
| | * | Merge 10.3 into 10.4Marko Mäkelä2022-10-131-2/+10
| | |\ \ | | | |/
| | | * Silence clang 13 -Wunused-but-set-variableMarko Mäkelä2022-10-131-2/+10
* | | | MDEV-28888 : Embedded MariaDB does not build on WindowsVladislav Vaintroub2022-07-032-11/+12
* | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-02-032-6/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '10.4' into 10.5Oleksandr Byelkin2022-02-011-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-01-301-1/+1
| | |\ \ | | | |/
| | | * Merge branch '10.2' into 10.3mariadb-10.3.33Oleksandr Byelkin2022-01-291-1/+1
| | | |\
| | | | * Fixed wrong function call in embedded serverMonty2022-01-281-1/+1
| | * | | Add new option NOT_EMBEDDED, for pluginsVladislav Vaintroub2021-11-091-2/+2
| * | | | fix query cache in embedded, enable MARIADB_CLIENT_EXTENDED_METADATASergei Golubchik2022-01-301-1/+1
| * | | | fix query cache in embeddedSergei Golubchik2022-01-302-4/+4
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-09-301-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-23306 Fix build dependencyVladislav Vaintroub2021-09-281-0/+3
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-09-241-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.4 into 10.5Marko Mäkelä2021-09-241-5/+7
| |\ \ \ \ | | |/ / /
| | * | | Fixed max length calculation for embedded serverMonty2021-09-211-5/+7
* | | | | fix main.lock_kill crashes in --ps --embedSergei Golubchik2021-06-301-1/+1
* | | | | MDEV-16708: fixed failure of the test sys_vars.sql_select_limit_funcDmitry Shulga2021-06-171-0/+6
* | | | | MDEV-16708: correct server side cursor detection in embeddedSergei Golubchik2021-06-171-5/+11
* | | | | MDEV-25602 get rid of __WIN__ in favor of standard _WIN32Vladislav Vaintroub2021-06-063-18/+11
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-06-011-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | followup: rename generated files to have distinct namesSergei Golubchik2021-05-271-3/+3
* | | | | Move debug_crash_here to it's own source filesMonty2021-05-191-1/+2
* | | | | MDEV-23842 Atomic RENAME TABLEMonty2021-05-191-1/+5
* | | | | Rename all external ddl_log function to start with ddl_log_ prefixMonty2021-05-191-1/+1
* | | | | Move all ddl log code to ddl_log.cc and ddl_log.hMonty2021-05-191-0/+1
* | | | | Change CHARSET_INFO character set and collaction names to LEX_CSTRINGMonty2021-05-191-3/+3
* | | | | Reduce usage of strlen()Monty2021-05-191-3/+8
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-05-071-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10Nikita Malyavin2021-05-051-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge branch bb-10.3-release into bb-10.4-releaseNikita Malyavin2021-05-051-2/+2
| | |\ \ \ | | | |/ /
| | | * | Fix of ppc64 by Wladmariadb-10.3.29Oleksandr Byelkin2021-05-051-2/+2
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-04-211-1/+1
|\ \ \ \ \ | |/ / / /
* | | | | MDEV-17399 Add support for JSON_TABLE.Alexey Botchkov2021-04-211-0/+1
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-02-171-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'bb-10.4-release' into bb-10.5-releaseSergei Golubchik2021-02-151-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'bb-10.3-release' into bb-10.4-releaseSergei Golubchik2021-02-121-1/+2
| | |\ \ \ | | | |/ /
| | | * | Merge branch '10.2' into 10.3Sergei Golubchik2021-02-011-1/+2
| | | |\ \ | | | | |/
| | | | * cleanup: fix and generalize handle_manager threadSergei Golubchik2021-01-241-1/+2
| | * | | Merge 10.3 into 10.4Marko Mäkelä2020-11-031-1/+2
| | |\ \ \ | | | |/ /
* | | | | Merge 10.5 into 10.6Marko Mäkelä2020-11-022-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2020-11-011-1/+2
| |\ \ \ \
| | * \ \ \ Merge branch '10.3' into 10.4Oleksandr Byelkin2020-10-311-1/+2
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-10-301-1/+2
| | | |\ \ | | | | |/