diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 10:47:52 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-03 12:19:59 +0200 |
| commit | d2f1c3ed6ccf823babf311970dfa0b7c57850db7 (patch) | |
| tree | 7c3db13f204c0a0c08f48ddaa402e64a2e209192 /storage/connect/jsonudf.cpp | |
| parent | 212994f704496d01881f377e34e04bd007e5e298 (diff) | |
| parent | af143474d8925cdbcfc0795a2bc274cbeaad8889 (diff) | |
| download | mariadb-git-d2f1c3ed6ccf823babf311970dfa0b7c57850db7.tar.gz | |
Merge branch '10.5' into bb-10.6-release
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 13778561aff..b29cc6a65a4 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"; |