summaryrefslogtreecommitdiff
path: root/sql/item_jsonfunc.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/
| | * MDEV-16209 JSON_EXTRACT in query crashes server.Alexey Botchkov2018-06-181-26/+36
| | * MDEV-15905 select json_value('{"b":true}','$.b')=1 --> false withAlexey Botchkov2018-06-171-1/+20
| * | Merge commit '6b8802e8dd5467556a024d807a1df23940b00895' into bb-10.3-fix_len_decbb-10.3-fix_len_decOleksandr Byelkin2018-06-191-21/+36
| |\ \ | | |/
| | * MDEV-11071: Assertion `thd->transaction.stmt.is_empty()' failed in Locked_tab...Oleksandr Byelkin2018-06-151-21/+36
* | | Merge branch '10.3' into 10.4Igor Babaev2018-06-031-25/+25
|\ \ \ | |/ /
| * | Add likely/unlikely to speed up executionMonty2018-05-071-24/+24
| * | Remove compiler warningsMichael Widenius2018-04-161-1/+1
* | | MDEV-16351 JSON_OBJECT() treats hybrid functions with boolean arguments as nu...Alexander Barkov2018-05-311-1/+1
|/ /
* | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-041-3/+3
|\ \
| * \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-011-3/+3
| |\ \ | | |/
| | * MDEV-13970 crash in Item_func_json_extract::read_json.Alexey Botchkov2017-12-251-3/+3
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-11-301-4/+6
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-11-201-4/+6
| |\ \ | | |/
| | * MDEV-14402 JSON_VALUE doesn't escape quote.Alexey Botchkov2017-11-161-4/+6
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-11-021-1/+3
|\ \ \ | |/ /
| * | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-11-011-1/+3
| |\ \ | | |/
| | * Compiler warnings fixed.Alexey Botchkov2017-10-301-1/+3
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-301-3/+19
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-181-3/+19
| |\ \ | | |/
| | * MDEV-13703 Illegal mix of collations for operation 'json_object' onAlexey Botchkov2017-10-061-2/+4
| | * MDEV-12311 Insufficient check for argument validity in JSON functions.Alexey Botchkov2017-10-051-1/+8
| | * MDEV-13306 JSON_CONTAINS returns wrong value.Alexey Botchkov2017-10-051-0/+7
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-9/+11
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-9/+11
| |\ \ | | |/
| | * MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-9/+11
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-141-5/+29
|\ \ \ | |/ /
| * | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-141-0/+2
| |\ \ | | |/
| | * MDEV-13633 JSON_ARRAY() - bad output with some UTF8 characters.Alexey Botchkov2017-09-131-0/+2
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-09-131-5/+27
| |\ \ | | |/
| | * MDEV-12877 Wrong result from JSON native function.Alexey Botchkov2017-09-131-0/+3
| | * MDEV-13786 compiler complains about uninitialized variable.Alexey Botchkov2017-09-121-1/+1
| | * MDEV-13104 Json functions.Alexey Botchkov2017-09-121-3/+14
| | * MDEV-13324 JSON_SET returns NULL instead of object.Alexey Botchkov2017-09-121-1/+5
| | * MDEV-12982 JSON_EXTRACT returns data for invalid JSON.Alexey Botchkov2017-09-121-0/+4
* | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2017-08-261-8/+11
|\ \ \ | |/ /
| * | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-8/+11
| |\ \ | | |/
View Lorry Controller Status