diff options
| author | Monty <monty@mariadb.org> | 2016-06-23 21:57:53 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-06-23 21:57:53 +0300 |
| commit | a0d9f20c0c77702d7a8a3dbc5c295e9b1eefcafa (patch) | |
| tree | 15fd0e625c4d4630e974f0bdc367db5bb6bc740a /storage/connect/jsonudf.cpp | |
| parent | ec38c7e60bf8dbe54b1551e75254337bec1993a4 (diff) | |
| download | mariadb-git-bb-10.2-decimal.tar.gz | |
Fixed compiler warnings and test failures found by buildbotbb-10.2-decimal
Fixed ccfilter to detect errors where the column is included in the error message
Diffstat (limited to 'storage/connect/jsonudf.cpp')
| -rw-r--r-- | storage/connect/jsonudf.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index 6987230121a..a60dacd80fb 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -1302,7 +1302,7 @@ static my_bool CalcLen(UDF_ARGS *args, my_bool obj, { char fn[_MAX_PATH]; unsigned long i, k, m, n; - long fl, j = -1; + long fl= 0, j = -1; reslen = args->arg_count + 2; @@ -1370,7 +1370,6 @@ static my_bool CalcLen(UDF_ARGS *args, my_bool obj, memlen += (k + sizeof(JOBJECT) + sizeof(JPAIR)); } else memlen += sizeof(JARRAY); - fl= 0; switch (args->arg_type[i]) { case STRING_RESULT: if (n == 2 && args->args[i]) { |