mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
202283 commits 2788 branches 343 tags 1.7 GiB
Commit graph

117 commits

Author SHA1 Message Date
Marko Mäkelä
7b2bb67113 Merge 10.3 into 10.4 2020-10-29 13:38:38 +02:00
Marko Mäkelä
a8de8f261d Merge 10.2 into 10.3 2020-10-28 10:01:50 +02:00
Vicențiu Ciorbaru
5a9df1550f MDEV-23941: strings/json_lib.c:893:12: style: Suspicious condition 
The characters parsed are always ascii characters, hence one byte. This
means that the code did not have "incorrect" logic because the boolean
condition, if true, would also evaluate to the value of 1.

The condition however is semantically wrong, assuming a length is equal
to the condition outcome. Change paranthesis to make it also read
according to the intent.
 2020-10-23 19:41:27 +03:00
Marko Mäkelä
c7ba92372b Merge 10.4 into 10.5 2020-03-17 07:58:41 +02:00
Marko Mäkelä
b7f0644710 MDEV-5313: Fix GCC 10 -Wenum-conversion 2020-03-16 16:32:11 +02:00
Marko Mäkelä
8b6cfda631 Merge 10.4 into 10.5 2020-02-07 08:51:20 +02:00
Monty
4d61f1247a Fixed compiler warnings from gcc 7.4.1 
- Fixed possible error in rocksdb/rdb_datadic.cc
 2020-01-29 23:23:55 +02:00
Alexander Barkov
f1e13fdc8d MDEV-21581 Helper functions and methods for CHARSET_INFO 2020-01-28 12:29:23 +04:00
Alexander Barkov
1ae09ec863 Merge remote-tracking branch 'origin/10.4' into 10.5 2019-10-01 11:44:27 +04:00
Alexander Barkov
dc588e3d3f Merge remote-tracking branch 'origin/10.3' into 10.4 2019-10-01 10:45:52 +04:00
Alexey Botchkov
6c2724fc05 MDEV-19628 JSON with starting double quotes key is not valid. 
Make the skip_key a bit faster.
 2019-09-30 15:27:48 +04:00
Alexey Botchkov
6ac2a35553 MDEV-19628 JSON with starting double quotes key is not valid. 
First character of the key name is just skipped, so the escapement
wasn't handled properly.
 2019-09-30 14:43:32 +04:00
Marko Mäkelä
d28686ada6 Merge 10.4 into 10.5 2019-09-12 16:36:46 +03:00
Marko Mäkelä
60c04be659 Merge 10.3 into 10.4 2019-09-12 12:16:40 +03:00
Alexey Botchkov
9554ef0678 MDEV-19670 json escaped unicode parse error. 
Fixed 4-byte length characters handled incorrectly.
 2019-09-12 11:12:55 +04:00
Vladislav Vaintroub
bd917e0811 Fix clang-cl warnings 2019-07-04 10:27:10 +02:00
Marko Mäkelä
5c3ff5cb93 Merge 10.3 into 10.4 2019-04-02 11:04:54 +03:00
Sergei Golubchik
4e1d3f83b7 Merge branch '10.2' into 10.3 2019-03-29 19:41:41 +01:00
Sergei Golubchik
cc71e7501c post-merge: -Werror fixes in 10.2 2019-03-29 10:58:25 +01:00
Alexey Botchkov
cc18a5db9b MDEV-5313 Improving audit API. 
json_locate_key() implemented.
get rid of 'key_len' argument in functions.
 2019-01-18 03:18:02 +04:00
Alexey Botchkov
dd03cb3776 MDEV-5313 Improving audit plugin API. 
Type conversion bug fixed.
 2019-01-17 19:49:56 +04:00
Alexey Botchkov
294d9bf248 MDEV-5313 Improving audit api. 
JSON api implementations and tests pushed.
sql_acl.cc fixed with the new function names.
 2019-01-17 03:52:52 +04:00
Sergei Golubchik
d68d7e50f9 json helpers 2018-12-12 00:31:43 +01:00
Alexey Botchkov
b1527ef51c MDEV-5313 Improving audit api. 
Service added to handle json.
 2018-12-12 01:49:39 +04:00
Marko Mäkelä
fd58bb71e2 Merge 10.2 into 10.3 2018-11-19 18:45:53 +02:00
Alexey Botchkov
b290ef8c76 MDEV-17454 JSON_VALID( '{"a":1]' ) evaluates to 1. 
Produce syntax error when '{...]'.
 2018-11-12 01:50:07 +04:00
Sergei Golubchik
57e0da50bb Merge branch '10.2' into 10.3 2018-09-28 16:37:06 +02:00
Alexey Botchkov
f54485eadb MDEV-17001 JSON_MERGE returns nullwhen merging empty array. 
Don't add the comma if nothing appended to the array.
 2018-09-13 13:42:09 +04:00
Alexey Botchkov
c8bb43a938 MDEV-17121 JSON_ARRAY_APPEND. 
Extra comma added to the result when an json array is empty.
 2018-09-11 14:37:45 +04:00
Marko Mäkelä
05459706f2 Merge 10.2 into 10.3 2018-08-03 15:57:23 +03:00
Alexey Botchkov
f4eac2deeb MDEV-16054 simple json functions flatline cpu on garbage input. 
Incorrect char sentence should be handled properly.
 2018-07-31 16:33:05 +04:00
luz.paz
3dd01669b4 Misc. typos 
Found via `codespell -i 3 -w --skip="./debian/po" -I ../mariadb-server-word-whitelist.txt  ./cmake/ ./debian/ ./Docs/ ./include/ ./man/ ./plugin/ ./strings/`
 2018-04-05 15:26:57 +04:00
Alexey Botchkov
ad647cc84e MDEV-15561 json_extract returns NULL with numbers in scientific notation. 
Scientific notation handling fixed.

Conflicts:
	mysql-test/r/func_json.result
	mysql-test/t/func_json.test
 2018-03-25 00:32:14 +04:00
Alexey Botchkov
d702e46390 MDEV-15561 json_extract returns NULL with numbers in scientific notation. 
Scientific notation handling fixed.
 2018-03-25 00:15:11 +04:00
Monty
60df17e95a Remove compiler warnings 2017-12-03 13:58:36 +02:00
Marko Mäkelä
7cb3520c06 Merge bb-10.2-ext into 10.3 2017-11-30 08:16:37 +02:00
Alexey Botchkov
1e2d4f677e MDEV-13971 crash in skip_num_constant. 
Character bigger than 0x60 wasn't handled properly
        inside a numeric constant.
 2017-11-11 13:54:56 +04:00
Alexander Barkov
835cbbcc7b Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 
TODO: enable MDEV-13049 optimization for 10.3
 2017-10-30 20:47:39 +04:00
Alexey Botchkov
3557de68d1 MDEV-12312 JSON_CONTAINS_PATH does not detect invalid path and returns 
TRUE.

        Let's make empty brackets to be the syntax error in the JSON
        paths.
 2017-10-06 10:01:35 +04:00
Marko Mäkelä
2c1067166d Merge bb-10.2-ext into 10.3 2017-10-04 08:24:06 +03:00
Vladislav Vaintroub
7354dc6773 MDEV-13384 - misc Windows warnings fixed 2017-09-28 17:20:46 +00:00
Marko Mäkelä
e17a282da9 Merge bb-10.2-ext into 10.3 2017-09-18 11:38:07 +03:00
Alexey Botchkov
e2b9f6762c Make compiler happy with the 'fall through' comments. 2017-09-14 14:30:24 +04:00
Alexey Botchkov
c94fb7b7c1 Compiler warning avoided. 2017-09-14 11:16:40 +04:00
Marko Mäkelä
348eaf4252 Merge bb-10.2-ext into 10.3 2017-09-14 09:12:47 +03:00
Alexey Botchkov
594c6b37f3 MDEV-13138 JSON_OBJECT returns null with strings containing backticks. 
Condition was fixed.
 2017-09-12 13:26:03 +04:00
Michael Widenius
4aaa38d26e Enusure that my_global.h is included first 
- 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
 2017-08-24 01:05:44 +02:00
Alexey Botchkov
bb71d9abf2 MDEV-12604 Comparison of JSON_EXTRACT result differs with Mysql. 
Comparison fixed to take the actual type of JSON value into
        account. Bug in escaping handling fixed.
 2017-08-08 10:35:26 +04:00
Alexey Botchkov
f701ac65e9 MDEV-12324 Wrong result (phantom array value) on JSON_EXTRACT. 
Fixed the path comparison.
 2017-08-07 13:46:45 +04:00
Alexey Botchkov
4a484e7a20 MDEV-12351 Assertion `cur_step->type & JSON_PATH_KEY' failed in 
json_find_path.

        The ..[0] path can be treated wrong on second json_find_path
        call.
 2017-05-02 15:16:01 +04:00