summaryrefslogtreecommitdiff
path: root/sql/item_jsonfunc.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-19160 JSON_DETAILED output unnecessarily verboseWeijun-H2023-01-051-9/+38
* 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.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.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 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 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
* | | Fix all warnings given by UBSANMonty2021-04-201-3/+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
* | | Merge 10.3 into 10.4Marko Mäkelä2020-07-021-0/+35
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-07-021-0/+35
| |\ \ | | |/
| | * MDEV-22976 CAST(JSON_EXTRACT() AS DECIMAL) does not handle boolean valuesAlexander Barkov2020-06-221-0/+35
* | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-191-0/+325
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2019-05-171-0/+325
| |\ \ | | |/
| | * MDEV-13992 Implement JSON_MERGE_PATCH.Alexey Botchkov2019-05-171-0/+325
* | | Merge 10.3 into 10.4Marko Mäkelä2019-03-201-2/+2
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-171-2/+2
| |\ \ | | |/
| | * post-merge: gcc 8 warningsSergei Golubchik2019-03-151-2/+2
* | | Merge 10.3 into 10.4Marko Mäkelä2019-03-121-2/+3
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-03-121-2/+3
| |\ \ | | |/
| | * MDEV-18886 JSON_ARRAY() does not recognise JSON argument.Alexey Botchkov2019-03-121-2/+3
* | | json helpersSergei Golubchik2018-12-121-7/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2018-11-191-0/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2018-11-191-0/+1
| |\ \ | | |/
| | * MDEV-16174 Assertion `0' failed in Type_handler_string_result::make_sort_key(...Alexey Botchkov2018-11-091-0/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2018-10-051-21/+18
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-281-21/+18
| |\ \ | | |/
| | * MDEV-17001 JSON_MERGE returns nullwhen merging empty array.Alexey Botchkov2018-09-131-16/+13
| | * MDEV-17018 JSON_SEARCH and User-Defined Variables.Alexey Botchkov2018-09-121-1/+1
| | * MDEV-17121 JSON_ARRAY_APPEND.Alexey Botchkov2018-09-111-2/+4
* | | Merge 10.3 into 10.4Marko Mäkelä2018-08-161-4/+4
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2018-08-121-4/+4
| |\ \ | | |/
| | * MDEV-16750 JSON_SET mishandles unicode every second pair of arguments.Alexey Botchkov2018-08-061-3/+3
| | * MDEV-16869 String functions don't respect character set of JSON_VALUE.Alexey Botchkov2018-08-051-1/+1
* | | Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2018-07-251-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.2' into 10.3Alexander Barkov2018-07-241-1/+1
| |\ \ | | |/
| | * MDEV-16814 CREATE TABLE SELECT JSON_QUOTE(multibyte_charset_expr) makes a fie...Alexander Barkov2018-07-241-1/+1
* | | Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2018-07-031-48/+92
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-27/+56
| |\ \ | | |/