Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-08-22 | 1 | -6/+4 |
|\ | |||||
| * | Merge 10.4 into 10.5 | Marko Mäkelä | 2022-08-22 | 1 | -6/+4 |
| |\ | |||||
| | * | Merge 10.3 into 10.4 | Marko Mäkelä | 2022-08-22 | 1 | -1/+6 |
| | |\ | |||||
| | | * | MDEV-27151: JSON_VALUE() does not parse NULL properties properly | Rucha Deodhar | 2022-08-11 | 1 | -1/+6 |
* | | | | Merge branch '10.6' into bb-10.6-release | Oleksandr Byelkin | 2022-08-15 | 1 | -3/+5 |
|\ \ \ \ | |||||
| * | | | | MDEV-29264: JSON function overflow error based on LONGTEXT field | qggcs | 2022-08-13 | 1 | -3/+5 |
* | | | | | Merge branch '10.5' into 10.6 | Oleksandr Byelkin | 2022-08-10 | 1 | -3/+1 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge branch '10.4' into 10.5mariadb-10.5.17 | Oleksandr Byelkin | 2022-08-10 | 1 | -3/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26 | Oleksandr Byelkin | 2022-08-10 | 1 | -3/+1 |
| | |\ \ | | | |/ | |||||
| | | * | refactor: remove redundant assignments | qggcs | 2022-08-09 | 1 | -3/+1 |
* | | | | Merge branch '10.5' into bb-10.6-release | Oleksandr Byelkin | 2022-08-03 | 1 | -16/+26 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.4' into 10.5 | Oleksandr Byelkin | 2022-08-03 | 1 | -16/+26 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2022-08-02 | 1 | -16/+26 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-28762: recursive call of some json functions without stack control | Rucha Deodhar | 2022-07-29 | 1 | -12/+20 |
| | | * | MDEV-29188 Crash in JSON_EXTRACT | Oleksandr Byelkin | 2022-07-29 | 1 | -3/+5 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2022-07-27 | 1 | -0/+143 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2022-07-27 | 1 | -0/+143 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2022-07-27 | 1 | -0/+143 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-28762: Fixup for clang | Marko Mäkelä | 2022-07-26 | 1 | -3/+2 |
| | | * | This commit is a fixup for MDEV-28762 | Rucha Deodhar | 2022-07-25 | 1 | -9/+21 |
| | | * | MDEV-28762: recursive call of some json functions without stack control | Rucha Deodhar | 2022-07-23 | 1 | -8/+19 |
| | | * | MDEV-28762: recursive call of some json functions without stack control | Rucha Deodhar | 2022-07-20 | 1 | -0/+121 |
* | | | | Merge branch '10.5' into 10.6 | Oleksandr Byelkin | 2022-02-03 | 1 | -3/+29 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-27018 IF and COALESCE lose "json" propertybb-10.5-bar-MDEV-27018 | Alexander Barkov | 2022-01-21 | 1 | -3/+29 |
* | | | | MDEV-24909 JSON functions don't respect KILL QUERY / max_statement_time limit | Sergei Golubchik | 2022-01-30 | 1 | -2/+31 |
* | | | | MDEV-24909 JSON functions don't respect KILL QUERY / max_statement_time limit | Sergei Golubchik | 2022-01-30 | 1 | -0/+2 |
* | | | | cleanup: move the common code into the function | Sergei Golubchik | 2022-01-30 | 1 | -21/+4 |
* | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2021-10-21 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2021-10-21 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.3 into 10.4 | Marko Mäkelä | 2021-10-21 | 1 | -0/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Merge 10.2 into 10.3 | Marko Mäkelä | 2021-10-21 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | MDEV-24585 Assertion `je->s.cs == nice_js->charset()' failed in json_nice.bb-10.2-mdev-24585-hf | Alexey Botchkov | 2021-10-19 | 1 | -0/+1 |
* | | | | | MDEV-26054 Server crashes in Item_func_json_arrayagg::get_str_from_field | Sergei Golubchik | 2021-06-30 | 1 | -2/+2 |
* | | | | | fix JSON_ARRAYAGG not to over-quote json in joins | Sergei Golubchik | 2021-06-30 | 1 | -2/+2 |
* | | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2021-06-29 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-23004 When using GROUP BY with JSON_ARRAYAGG with joint table, the | Alexey Botchkov | 2021-06-28 | 1 | -0/+6 |
* | | | | | Reduce usage of strlen() | Monty | 2021-05-19 | 1 | -55/+55 |
* | | | | | Split item->flags into base_flags and with_flags | Monty | 2021-05-19 | 1 | -20/+18 |
* | | | | | Change bitfields in Item to an uint16 | Michael Widenius | 2021-05-19 | 1 | -30/+30 |
* | | | | | Revert MDEV-14517 Cleanup for Item::with_subselect | Michael Widenius | 2021-05-19 | 1 | -1/+1 |
* | | | | | Merge 10.5 into 10.6 | Marko Mäkelä | 2021-04-21 | 1 | -3/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2021-04-21 | 1 | -3/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix all warnings given by UBSAN | Monty | 2021-04-20 | 1 | -3/+2 |
* | | | | | MDEV-17399 Add support for JSON_TABLE. | Alexey Botchkov | 2021-04-21 | 1 | -17/+28 |
* | | | | | Fix several typos in sql/item_jsonfunc.cc | Hollow Man | 2021-03-11 | 1 | -4/+4 |
|/ / / / | |||||
* | | | | Merge 10.4 into 10.5 | Marko Mäkelä | 2020-10-30 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2020-10-29 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-10-28 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-20593 SIGSEGV in report_json_error_ex (on optimized builds). | Alexey Botchkov | 2020-10-22 | 1 | -0/+2 |
* | | | | MDEV-23437 Item_func_json_objectagg::print is not implemented. | Alexey Botchkov | 2020-10-24 | 1 | -4/+2 |