summaryrefslogtreecommitdiff
path: root/sql/item_jsonfunc.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.5 into 10.6Marko Mäkelä2022-08-221-6/+4
|\
| * Merge 10.4 into 10.5Marko Mäkelä2022-08-221-6/+4
| |\
| | * Merge 10.3 into 10.4Marko Mäkelä2022-08-221-1/+6
| | |\
| | | * MDEV-27151: JSON_VALUE() does not parse NULL properties properlyRucha Deodhar2022-08-111-1/+6
* | | | Merge branch '10.6' into bb-10.6-releaseOleksandr Byelkin2022-08-151-3/+5
|\ \ \ \
| * | | | MDEV-29264: JSON function overflow error based on LONGTEXT fieldqggcs2022-08-131-3/+5
* | | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-08-101-3/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch '10.4' into 10.5mariadb-10.5.17Oleksandr Byelkin2022-08-101-3/+1
| |\ \ \ | | |/ /
| | * | Merge branch '10.3' into bb-10.4-releasemariadb-10.4.26Oleksandr Byelkin2022-08-101-3/+1
| | |\ \ | | | |/
| | | * refactor: remove redundant assignmentsqggcs2022-08-091-3/+1
* | | | Merge branch '10.5' into bb-10.6-releaseOleksandr Byelkin2022-08-031-16/+26
|\ \ \ \ | |/ / /
| * | | Merge branch '10.4' into 10.5Oleksandr Byelkin2022-08-031-16/+26
| |\ \ \ | | |/ /
| | * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-08-021-16/+26
| | |\ \ | | | |/
| | | * MDEV-28762: recursive call of some json functions without stack controlRucha Deodhar2022-07-291-12/+20
| | | * MDEV-29188 Crash in JSON_EXTRACTOleksandr Byelkin2022-07-291-3/+5
* | | | Merge 10.5 into 10.6Marko Mäkelä2022-07-271-0/+143
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2022-07-271-0/+143
| |\ \ \ | | |/ /
| | * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-07-271-0/+143
| | |\ \ | | | |/
| | | * MDEV-28762: Fixup for clangMarko Mäkelä2022-07-261-3/+2
| | | * This commit is a fixup for MDEV-28762Rucha Deodhar2022-07-251-9/+21
| | | * MDEV-28762: recursive call of some json functions without stack controlRucha Deodhar2022-07-231-8/+19
| | | * MDEV-28762: recursive call of some json functions without stack controlRucha Deodhar2022-07-201-0/+121
* | | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-02-031-3/+29
|\ \ \ \ | |/ / /
| * | | MDEV-27018 IF and COALESCE lose "json" propertybb-10.5-bar-MDEV-27018Alexander Barkov2022-01-211-3/+29
* | | | MDEV-24909 JSON functions don't respect KILL QUERY / max_statement_time limitSergei Golubchik2022-01-301-2/+31
* | | | MDEV-24909 JSON functions don't respect KILL QUERY / max_statement_time limitSergei Golubchik2022-01-301-0/+2
* | | | cleanup: move the common code into the functionSergei Golubchik2022-01-301-21/+4
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-10-211-0/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.4 into 10.5Marko Mäkelä2021-10-211-0/+1
| |\ \ \ | | |/ /
| | * | Merge 10.3 into 10.4Marko Mäkelä2021-10-211-0/+1
| | |\ \ | | | |/
| | | * Merge 10.2 into 10.3Marko Mäkelä2021-10-211-0/+1
| | | |\
| | | | * MDEV-24585 Assertion `je->s.cs == nice_js->charset()' failed in json_nice.bb-10.2-mdev-24585-hfAlexey Botchkov2021-10-191-0/+1
* | | | | MDEV-26054 Server crashes in Item_func_json_arrayagg::get_str_from_fieldSergei Golubchik2021-06-301-2/+2
* | | | | fix JSON_ARRAYAGG not to over-quote json in joinsSergei Golubchik2021-06-301-2/+2
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-06-291-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-23004 When using GROUP BY with JSON_ARRAYAGG with joint table, theAlexey Botchkov2021-06-281-0/+6
* | | | | Reduce usage of strlen()Monty2021-05-191-55/+55
* | | | | Split item->flags into base_flags and with_flagsMonty2021-05-191-20/+18
* | | | | Change bitfields in Item to an uint16Michael Widenius2021-05-191-30/+30
* | | | | Revert MDEV-14517 Cleanup for Item::with_subselectMichael Widenius2021-05-191-1/+1
* | | | | Merge 10.5 into 10.6Marko Mäkelä2021-04-211-3/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-211-3/+2
| |\ \ \ \ | | |/ / /
| | * | | Fix all warnings given by UBSANMonty2021-04-201-3/+2
* | | | | MDEV-17399 Add support for JSON_TABLE.Alexey Botchkov2021-04-211-17/+28
* | | | | Fix several typos in sql/item_jsonfunc.ccHollow Man2021-03-111-4/+4
|/ / / /
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-10-301-0/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-10-291-0/+2
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2020-10-281-0/+2
| | |\ \ | | | |/
| | | * MDEV-20593 SIGSEGV in report_json_error_ex (on optimized builds).Alexey Botchkov2020-10-221-0/+2
* | | | MDEV-23437 Item_func_json_objectagg::print is not implemented.Alexey Botchkov2020-10-241-4/+2