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.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-03 07:12:27 +02:00
parent 7b500f04fb 48e35b8cf6
commit af143474d8
73 changed files with 664 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/connect/jsonudf.cpp
View File

@@ -1815,7 +1815,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
} // endif *s
if (n < 1)
return (PCSZ) "Key";
return (PCSZ) "Key";
if (!b) {
if ((p = (PSZ)PlgDBSubAlloc(g, NULL, n + 1))) {
@@ -1829,7 +1829,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
} // endif s
return (char*) s;
return s;
} // endif count
return (PCSZ) "Key";