diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 07:12:27 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 07:12:27 +0200 |
| commit | af143474d8925cdbcfc0795a2bc274cbeaad8889 (patch) | |
| tree | 790022e64c90ce37310d20f1de25af35b0f722c9 /storage/connect/jsonudf.cpp | |
| parent | 7b500f04fb0baf56b02583f82982508203e58d38 (diff) | |
| parent | 48e35b8cf61cbedb515787762708afe7bd75386b (diff) | |
| download | mariadb-git-af143474d8925cdbcfc0795a2bc274cbeaad8889.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'storage/connect/jsonudf.cpp')
| -rw-r--r-- | storage/connect/jsonudf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index b61840a334d..1ae722a2fc5 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -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"; |