diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-10-02 22:35:13 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-02 22:35:13 +0400 |
| commit | 8ae8cd63485eb063de0b70ea6f3acf7102a61fef (patch) | |
| tree | 70fa448baa769b6c8c331063a61bf929ad61c976 /storage/connect/jsonudf.cpp | |
| parent | 6857cb57fe7090f131b272f31485b7a478a0b324 (diff) | |
| parent | 387bdf07ae0973bc3e4dc3f5064d2a29c64bb769 (diff) | |
| download | mariadb-git-8ae8cd63485eb063de0b70ea6f3acf7102a61fef.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'storage/connect/jsonudf.cpp')
| -rw-r--r-- | storage/connect/jsonudf.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index 29bccc4afeb..2733479a4e6 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -1564,7 +1564,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i) n = strlen(s); if (IsJson(args, i)) - j = strchr(s, '_') - s + 1; + j = (int)(strchr(s, '_') - s + 1); if (j && n > j) { s += j; |