diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-08 17:15:13 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-08 17:15:13 +0200 |
| commit | 50b270525a5d2626c81425890e74d906f5515e89 (patch) | |
| tree | 3500af31b2674edd9f9d621f8549b6911ab7cdec /storage/connect/jsonudf.cpp | |
| parent | 9cbf8ccf2990f9db8d9debee42bc9213cbb04457 (diff) | |
| parent | 1d480419822b53c840de54542c1d1a0851dbe2c8 (diff) | |
| download | mariadb-git-50b270525a5d2626c81425890e74d906f5515e89.tar.gz | |
Merge branch '10.7' into 10.8
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 4da780e4104..f6325c89c5a 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -1816,7 +1816,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))) { @@ -1830,7 +1830,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i) } // endif s - return (char*) s; + return s; } // endif count return (PCSZ) "Key"; |