database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-30 05:23:50 +03:00
Code Activity
186,141 Commits 3,296 Branches 1,099 Tags
4ba36cfa0c677b7d094092d6aa5541c6c936a11f
Commit Graph

109 Commits

Author SHA1 Message Date
Sergei Golubchik
c1fd027115 Merge branch '10.2' into 10.3 2019-05-17 17:23:01 +02:00
Alexey Botchkov
cd16d6d518 MDEV-13992 Implement JSON_MERGE_PATCH. 
JSON_MERGE_PATCH implemented. Added JSON_MERGE_PRESERVE as a synonim for
the JSON_MERGE.
 2019-05-17 11:53:58 +04:00
Sergei Golubchik
b64fde8f38 Merge branch '10.2' into 10.3 2019-03-17 13:06:41 +01:00
Sergei Golubchik
f1134d5676 post-merge: gcc 8 warnings 
note: Inherit String from Sql_alloc,
to get operators new and new[] in sync

in rocksdb gcc was complaining that non-lvalue was cast to const.
 2019-03-15 21:00:50 +01:00
Marko Mäkelä
b32bc70e34 Merge 10.2 into 10.3 2019-03-12 14:26:34 +02:00
Alexey Botchkov
acb4a87204 MDEV-18886 JSON_ARRAY() does not recognise JSON argument. 
JSON_ARRAY and JSON_OBJECT functions with no arguments now get the
connection charset. Item_func_convert_charset returns the correct
is_json() flag.
 2019-03-12 01:09:55 +04:00
Marko Mäkelä
fd58bb71e2 Merge 10.2 into 10.3 2018-11-19 18:45:53 +02:00
Alexey Botchkov
5cfb043d29 MDEV-16174 Assertion `0' failed in Type_handler_string_result::make_sort_key(uchar*, Item*, const SORT_FIELD_ATTR*, Sort_param*) 
maybe_null should be always set to TRUE in
Item_func_json_array_append::fix_length_and_dec()
 2018-11-09 22:55:34 +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
a93363022c MDEV-17018 JSON_SEARCH and User-Defined Variables. 
Item_func_json_search needs a member to store the path.
 2018-09-12 21:57:28 +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
Sergei Golubchik
0aa9b03393 Merge branch '10.2' into 10.3 2018-08-12 12:02:23 +02:00
Alexey Botchkov
4ddcb4eb46 MDEV-16750 JSON_SET mishandles unicode every second pair of arguments. 
The charset of temporary storage (Item_func_json_insert::tmp_js)
  was not properly set.
 2018-08-06 13:37:09 +04:00
Alexey Botchkov
fc324a5f87 MDEV-16869 String functions don't respect character set of JSON_VALUE. 
Item_func_json_value::val_str() produced string of wrong charset.
 2018-08-05 18:33:17 +04:00
Alexander Barkov
294a426088 Merge remote-tracking branch 'origin/10.2' into 10.3 2018-07-24 18:44:49 +04:00
Alexander Barkov
a8227a1543 MDEV-16814 CREATE TABLE SELECT JSON_QUOTE(multibyte_charset_expr) makes a field of a wrong length 2018-07-24 18:15:15 +04:00
Sergei Golubchik
36e59752e7 Merge branch '10.2' into 10.3 2018-06-30 16:39:20 +02:00
Oleksandr Byelkin
083279f783 Merge commit '6b8802e8dd5467556a024d807a1df23940b00895' into bb-10.3-fix_len_dec 2018-06-19 14:51:50 +02:00
Alexey Botchkov
5ba6cee012 MDEV-16209 JSON_EXTRACT in query crashes server. 
The optimizer can create various item's over the original one,
    so we can't count on the exact item's type inside the comparison.
 2018-06-18 23:00:34 +04:00
Alexey Botchkov
352c7e0dfa MDEV-15905 select json_value('{"b":true}','$.b')=1 --> false with 
"Truncated incorrect DOUBLE value: 'true'".

JSON_VALUE_TRUE and JSON_VALUE_FALSE should be handled specifically
in Item_json_value.
 2018-06-17 17:15:21 +04:00
Oleksandr Byelkin
6b8802e8dd MDEV-11071: Assertion `thd->transaction.stmt.is_empty()' failed in Locked_tables_list::unlock_locked_table 
fix_length_and_dec now return result (error/OK)
 2018-06-15 10:31:30 +02:00
Monty
30ebc3ee9e Add likely/unlikely to speed up execution 
Added to:
- if (error)
- Lex
- sql_yacc.yy and sql_yacc_ora.yy
- In header files to alloc() calls
- Added thd argument to thd_net_is_killed()
 2018-05-07 00:07:32 +03:00
Michael Widenius
ddc5764303 Remove compiler warnings 
- Remove unused variables
- Mark variables unused
- Fix wrong types
- Add no-strict-aliasing to BUILD scripts
 2018-04-16 20:16:43 +03:00
Marko Mäkelä
145ae15a33 Merge bb-10.2-ext into 10.3 2018-01-04 09:22:59 +02:00
Monty
fbab79c9b8 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 
Conflicts:
	cmake/make_dist.cmake.in
	mysql-test/r/func_json.result
	mysql-test/r/ps.result
	mysql-test/t/func_json.test
	mysql-test/t/ps.test
	sql/item_cmpfunc.h
 2018-01-01 19:39:59 +02:00
Alexey Botchkov
f0f3b6549a MDEV-13970 crash in Item_func_json_extract::read_json. 
Item_func_json_extract::val_int fixed.
        It wasn't tested yet as it's called in exotic cases only.
 2017-12-25 08:10:48 +04:00
Marko Mäkelä
7cb3520c06 Merge bb-10.2-ext into 10.3 2017-11-30 08:16:37 +02:00
Alexander Barkov
4a8039b04e Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-11-20 11:12:08 +04:00
Alexey Botchkov
842dce378a MDEV-14402 JSON_VALUE doesn't escape quote. 
Result unescaping added.
 2017-11-16 19:59:27 +04:00
Marko Mäkelä
5603a5842b Merge bb-10.2-ext into 10.3 2017-11-02 12:08:37 +02:00
Marko Mäkelä
2ec7b87053 Merge 10.2 into bb-10.2-ext 2017-11-01 14:37:31 +02: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
b5689c6c87 Compiler warnings fixed. 2017-10-30 14:59:43 +04:00
Alexander Barkov
30e7d6709f Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-10-18 14:11:55 +04:00
Alexey Botchkov
a3ba8c3660 MDEV-13703 Illegal mix of collations for operation 'json_object' on 
using JSON_UNQUOTE as an argument.

        The coercibility and repertoire should be set properly for the
        JSON_UNQUOTE.
 2017-10-06 09:28:33 +04:00
Alexey Botchkov
f1a20ec396 MDEV-12311 Insufficient check for argument validity in JSON functions. 
Check validity to the end of the JSON in the json_length
        function.
 2017-10-05 23:46:25 +04:00
Alexey Botchkov
1f6ada8da8 MDEV-13306 JSON_CONTAINS returns wrong value. 
The 'value' state should be saved to be compared against the
        next array item.
 2017-10-05 23:23:39 +04:00
Marko Mäkelä
2c1067166d Merge bb-10.2-ext into 10.3 2017-10-04 08:24:06 +03:00
Alexander Barkov
8ae8cd6348 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-10-02 22:35:13 +04:00
Vladislav Vaintroub
7354dc6773 MDEV-13384 - misc Windows warnings fixed 2017-09-28 17:20:46 +00:00
Marko Mäkelä
348eaf4252 Merge bb-10.2-ext into 10.3 2017-09-14 09:12:47 +03:00
Marko Mäkelä
c97e504a5f Merge 10.2 into bb-10.2-ext 2017-09-14 08:09:44 +03:00
Alexey Botchkov
dc82f70e9f MDEV-13633 JSON_ARRAY() - bad output with some UTF8 characters. 
set_charset() calls added for Item_func_json_arran
        and Item_func_json_object::val_str-s.
 2017-09-13 15:17:28 +04:00
Alexander Barkov
178540b904 Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext 2017-09-13 12:12:05 +04:00
Alexey Botchkov
a237a92099 MDEV-12877 Wrong result from JSON native function. 
Set default charset for temporary paths so UDF call don't crash.
 2017-09-13 00:36:09 +04:00
Alexey Botchkov
30db4e1fc7 MDEV-13786 compiler complains about uninitialized variable. 
'=0' added to meke the compiler happy.
 2017-09-12 15:33:30 +04:00
Alexey Botchkov
0cd731864e MDEV-13104 Json functions. 
An extra ',' added to the JSON_MERGE result making it invalid.
 2017-09-12 15:21:53 +04:00
Alexey Botchkov
467acc2119 MDEV-13324 JSON_SET returns NULL instead of object. 
Superfluous ',' was added to the JSON_SET result so it became
        invalid.
 2017-09-12 14:40:18 +04:00
Alexey Botchkov
6352ec2184 MDEV-12982 JSON_EXTRACT returns data for invalid JSON. 
Let's check the validity to the end of the JSON.
 2017-09-12 11:20:30 +04:00