database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.7 into 10.8

Browse Source 
The MDEV-25004 test innodb_fts.versioning is omitted because ever since
commit 685d958e38 InnoDB would not allow
writes to a database where the redo log file ib_logfile0 is missing.
This commit is contained in:
Marko Mäkelä
2023-01-10 14:42:50 +02:00
parent 8bddaddc6f ab36eac584
commit 92c8d6f168
201 changed files with 3246 additions and 2325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/json_lib.h
View File

@@ -378,7 +378,7 @@ int json_find_paths_next(json_engine_t *je, json_find_paths_t *state);
#define JSON_ERROR_ILLEGAL_SYMBOL (-2)
/*
Converst JSON string constant into ordinary string constant
Convert JSON string constant into ordinary string constant
which can involve unpacking json escapes and changing character set.
Returns negative integer in the case of an error,
the length of the result otherwise.