summaryrefslogtreecommitdiff
path: root/strings/json_lib.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2018-08-031-0/+2
|\
| * MDEV-16054 simple json functions flatline cpu on garbage input.Alexey Botchkov2018-07-311-0/+2
| | | | | | | | Incorrect char sentence should be handled properly.
| * MDEV-15561 json_extract returns NULL with numbers in scientific notation.Alexey Botchkov2018-03-251-2/+2
| | | | | | | | Scientific notation handling fixed.
* | Misc. typosluz.paz2018-04-051-1/+1
| | | | | | | | Found via `codespell -i 3 -w --skip="./debian/po" -I ../mariadb-server-word-whitelist.txt ./cmake/ ./debian/ ./Docs/ ./include/ ./man/ ./plugin/ ./strings/`
* | MDEV-15561 json_extract returns NULL with numbers in scientific notation.Alexey Botchkov2018-03-251-2/+2
| | | | | | | | | | | | | | | | Scientific notation handling fixed. Conflicts: mysql-test/r/func_json.result mysql-test/t/func_json.test
* | Remove compiler warningsMonty2017-12-031-2/+2
| |
* | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-11-301-1/+1
|\ \ | |/
| * MDEV-13971 crash in skip_num_constant.Alexey Botchkov2017-11-111-1/+1
| | | | | | | | | | Character bigger than 0x60 wasn't handled properly inside a numeric constant.
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-301-1/+1
|\ \ | |/ | | | | TODO: enable MDEV-13049 optimization for 10.3
| * MDEV-12312 JSON_CONTAINS_PATH does not detect invalid path and returnsAlexey Botchkov2017-10-061-1/+1
| | | | | | | | | | | | | | TRUE. Let's make empty brackets to be the syntax error in the JSON paths.
* | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-5/+5
|\ \ | |/
| * MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-5/+5
| |
* | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-181-4/+5
|\ \ | |/
| * Make compiler happy with the 'fall through' comments.Alexey Botchkov2017-09-141-3/+4
| |
| * Compiler warning avoided.Alexey Botchkov2017-09-141-1/+1
| |
* | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-141-1/+1
|\ \ | |/
| * MDEV-13138 JSON_OBJECT returns null with strings containing backticks.Alexey Botchkov2017-09-121-1/+1
| | | | | | | | Condition was fixed.
* | Enusure that my_global.h is included firstMichael Widenius2017-08-241-2/+0
|/ | | | | | | | | | - Added sql/mariadb.h file that should be included first by files in sql directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables that must be done before my_global.h is included) - Removed a lot of include my_global.h from include files - Removed include's of some files that my_global.h automatically includes - Removed duplicated include's of my_sys.h - Replaced include my_config.h with my_global.h
* MDEV-12604 Comparison of JSON_EXTRACT result differs with Mysql.Alexey Botchkov2017-08-081-1/+1
| | | | | Comparison fixed to take the actual type of JSON value into account. Bug in escaping handling fixed.
* MDEV-12324 Wrong result (phantom array value) on JSON_EXTRACT.Alexey Botchkov2017-08-071-1/+1
| | | | Fixed the path comparison.
* MDEV-12351 Assertion `cur_step->type & JSON_PATH_KEY' failed inAlexey Botchkov2017-05-021-0/+1
| | | | | | | json_find_path. The ..[0] path can be treated wrong on second json_find_path call.
* MDEV-11856 json_search doesn't search for values with double quotesAlexey Botchkov2017-03-141-0/+2
| | | | | | | | character ("). The my_wildcmp function doesn't expect the string parameter to have escapements, only the template. So the string should be unescaped if necessary.
* MDEV-11858 json_merge() concatenates instead of merging.Alexey Botchkov2017-02-101-7/+0
| | | | Fix json_merge implementation.
* MDEV-11857 json_search() shows "Out of memory" with empty key.Alexey Botchkov2017-02-091-1/+3
| | | | We should be ready for an empty key.
* MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-02-061-24/+86
| | | | Fixes for issues found.
* MDEV-11938 json.json_no_table crashes or fails with valgrind warnings in ↵Alexey Botchkov2017-02-021-30/+54
| | | | | | json_find_path / Item_func_json_length::val_int. Paths with quoted keynames handled improperly.
* MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-01-261-6/+37
| | | | paths ending on [0]..[0] should be handled in conforming manner.
* MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-01-241-26/+140
| | | | json_no_table.test ported.
* MDEV-11042 Implement GeoJSON functions.Alexey Botchkov2017-01-241-4/+1
| | | | ST_AsGeoJSON and ST_GeomFromGeoJSON functions implemented.
* MDEV-11571 JSON_EXTRACT returns wrong results.Alexey Botchkov2016-12-241-4/+1
| | | | Array counter didn't increment after an item was found.
* MDEV-11562 Assertion `js->state == JST_VALUE' failed in ↵Alexey Botchkov2016-12-161-18/+5
| | | | | | | | check_contains(json_engine_t*, json_engine_t*). check_contains() fixed. When an item of an array is a complex structure, it can be half-read after the end of the recursive check_contains() call. So we just manually get to it's ending.
* MDEV-11470 JSON_KEYS accepts arguments in invalid format.Alexey Botchkov2016-12-131-5/+7
| | | | Now JSON functions return warnings if arguments are invalid.
* MDEV-11453 JSON_CONTAINS returns incorrect values.Alexey Botchkov2016-12-111-0/+7
| | | | The weird logic of json_contains was implemented.
* MDEV-11469 JSON_SEARCH returns incorrect results.Alexey Botchkov2016-12-091-26/+42
| | | | Support for '**' in json path expressions added.
* MDEV-11461 JSON_TYPE does not recognize integer/double types.Alexey Botchkov2016-12-051-0/+16
| | | | Integer/Double recognition added.
* MDEV-11463 Server crashes in mark_array upon JSON_VALID.Alexey Botchkov2016-12-031-9/+29
| | | | The depth of nested arrays should be controlled, as it's limited.
* MDEV-9143 JSON_xxx functions.Alexey Botchkov2016-11-151-2/+4
| | | | | The rest of mysql/json functions implemented. CAST AS JSON implemented.
* MDEV-9143 JSON_xxx functions.Alexey Botchkov2016-10-191-0/+1553
strings/json_lib.c added as a JSON library. SQL frunction added with sql/item_jsonfunc.h/cc
View Lorry Controller Status