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 branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2025-06-04 14:09:23 +02:00
parent e7aaf29e00 643319a7fb
commit 28d6530571
51 changed files with 534 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/connect/jsonudf.cpp
View File

@@ -113,7 +113,7 @@ my_bool JSNX::SetJpath(PGLOBAL g, char *path, my_bool jb)
/*********************************************************************************/
/* Analyse array processing options. */
/*********************************************************************************/
my_bool JSNX::SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm)
my_bool JSNX::SetArrayOptions(PGLOBAL g, char *p, int i)
{
int n = (int)strlen(p);
my_bool dg = true, b = false;
@@ -263,7 +263,7 @@ my_bool JSNX::ParseJpath(PGLOBAL g)
// Jpath must be explicit
if (a || *p == 0 || *p == '[' || IsNum(p)) {
// Analyse intermediate array processing
if (SetArrayOptions(g, p, i, Nodes[i-1].Key))
if (SetArrayOptions(g, p, i))
return true;
} else if (*p == '*') {