Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2022-01-30 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.2' into 10.3mariadb-10.3.33 | Oleksandr Byelkin | 2022-01-29 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixed wrong function call in embedded server | Monty | 2022-01-28 | 1 | -1/+1 |
* | | | Add new option NOT_EMBEDDED, for plugins | Vladislav Vaintroub | 2021-11-09 | 1 | -2/+2 |
* | | | Fixed max length calculation for embedded server | Monty | 2021-09-21 | 1 | -5/+7 |
* | | | Merge branch bb-10.3-release into bb-10.4-release | Nikita Malyavin | 2021-05-05 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Fix of ppc64 by Wladmariadb-10.3.29 | Oleksandr Byelkin | 2021-05-05 | 1 | -2/+2 |
* | | | Merge branch 'bb-10.3-release' into bb-10.4-release | Sergei Golubchik | 2021-02-12 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2021-02-01 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | cleanup: fix and generalize handle_manager thread | Sergei Golubchik | 2021-01-24 | 1 | -1/+2 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-11-03 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.2' into 10.3 | Oleksandr Byelkin | 2020-10-30 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | MDEV-19838: followup, fix for PS & embedded | Oleksandr Byelkin | 2020-10-29 | 1 | -1/+2 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-10-29 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | cleanup: use predefined CMAKE_DL_LIBS | Sergei Golubchik | 2020-10-23 | 1 | -1/+1 |
* | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2020-08-03 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-19632 Replication aborts with ER_SLAVE_CONVERSION_FAILED upon CREATE ...... | Alexander Barkov | 2020-08-01 | 1 | -0/+1 |
* | | | Merge remote-tracking branch 'origin/10.3' into 10.4 | Monty | 2020-07-03 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed errors found by MSAN | Monty | 2020-07-02 | 1 | -0/+1 |
* | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-07-02 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-07-02 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | MDEV-20377: Make WITH_MSAN more usable | Marko Mäkelä | 2020-07-01 | 1 | -0/+2 |
* | | | Merge branch '10.3' into 10.4 | Sergei Golubchik | 2019-09-06 | 2 | -4/+15 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 (up to commit ef00ac4c86daf3294c46a45358da636763fb0049) into 10.3 | Alexander Barkov | 2019-09-04 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-18156 Assertion `0' failed or `btr_validate_index(index, 0, false)' in r... | Alexander Barkov | 2019-09-03 | 1 | -0/+1 |
| * | | Merge branch '10.2' into 10.3 | Monty | 2019-09-03 | 1 | -4/+14 |
| |\ \ | | |/ | |||||
| | * | embedded client now writes errors to stderr during init_embedded_server | Monty | 2019-09-01 | 1 | -3/+14 |
* | | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-05-19 | 13 | -13/+13 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 13 | -13/+13 |
| |\ \ | | |/ | |||||
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 13 | -13/+13 |
| | |\ | |||||
| | | * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 11 | -11/+11 |
| | | |\ | |||||
| | | | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 11 | -11/+11 |
* | | | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-05-05 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Cleanup session tracker redundancy | Sergey Vojtovich | 2019-05-03 | 1 | -1/+0 |
* | | | | | Just move, no code changes otherwise. | Sergey Vojtovich | 2019-04-25 | 1 | -0/+1 |
* | | | | | MDEV-19125 Change Send_field::type from enum_field_types to Type_handler* | Alexander Barkov | 2019-04-02 | 1 | -1/+1 |
* | | | | | MDEV-18408 Assertion `0' failed in Item::val_native_result / Timestamp_or_zer... | Alexander Barkov | 2019-02-25 | 1 | -93/+139 |
* | | | | | Merge branch '10.4' into bb-10.4-mdev16188bb-10.4-mdev16188 | Sergei Golubchik | 2019-02-15 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | A cleanup for MDEV-13916 Enforce check constraint on JSON type | Alexander Barkov | 2019-02-15 | 1 | -0/+1 |
* | | | | | | Merge branch '10.4' into bb-10.4-mdev16188 | Igor Babaev | 2019-02-14 | 1 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.4' into bb-10.4-mdev17096 | Igor Babaev | 2019-02-12 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | MDEV-6111 Optimizer Trace | Varun Gupta | 2019-02-13 | 1 | -0/+1 |
| * | | | | | | Merge branch '10.4' into bb-10.4-mdev17096 | Igor Babaev | 2019-02-06 | 4 | -13/+9 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | MDEV-17096 Pushdown of simple derived tables to storage engines | Igor Babaev | 2019-02-06 | 1 | -1/+2 |
* | | | | | | | Fixed a merge problem: missing reference to rowid_filter.cc in a cmake file | Igor Babaev | 2019-02-04 | 1 | -0/+1 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Move THD list handling to THD_list | Sergey Vojtovich | 2019-01-28 | 1 | -7/+2 |
* | | | | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-01-24 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-01-24 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-01-24 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2019-01-24 | 1 | -1/+1 |
| | | |\ \ \ |