diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-23 19:35:50 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-23 19:35:50 +0200 |
commit | 3e36eb230b65d53acc8e02b00a024e72ed249425 (patch) | |
tree | be89d99353fc70488a5b43707fac12b960f2f29b /storage/connect/jsonudf.h | |
parent | e8333389c89c946d3794ec9ea708d308318301a3 (diff) | |
download | mariadb-git-3e36eb230b65d53acc8e02b00a024e72ed249425.tar.gz |
Fix gcc compiler warnings reported by Sergei
modified: storage/connect/array.cpp
modified: storage/connect/array.h
modified: storage/connect/blkfil.cpp
modified: storage/connect/blkfil.h
modified: storage/connect/block.h
modified: storage/connect/colblk.cpp
modified: storage/connect/colblk.h
modified: storage/connect/csort.h
modified: storage/connect/filamvct.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
modified: storage/connect/global.h
modified: storage/connect/json.h
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/tabcol.cpp
modified: storage/connect/tabcol.h
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabdos.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/table.cpp
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabodbc.h
modified: storage/connect/tabsys.h
modified: storage/connect/tabxml.h
modified: storage/connect/value.cpp
modified: storage/connect/value.h
modified: storage/connect/xindex.cpp
modified: storage/connect/xindex.h
modified: storage/connect/xobject.cpp
modified: storage/connect/xobject.h
modified: storage/connect/xtable.h
Set values as nullable when retrieving catalog info
modified: storage/connect/jdbconn.cpp
modified: storage/connect/mysql-test/connect/r/odbc_oracle.result
modified: storage/connect/odbconn.cpp
Change format of Jpath
modified: storage/connect/json.cpp
modified: storage/connect/jsonudf.cpp
modified: storage/connect/mysql-test/connect/r/json.result
modified: storage/connect/mysql-test/connect/r/json_udf.result
modified: storage/connect/mysql-test/connect/r/json_udf_bin.result
modified: storage/connect/mysql-test/connect/r/zip.result
modified: storage/connect/mysql-test/connect/t/json.test
modified: storage/connect/mysql-test/connect/t/json_udf.test
modified: storage/connect/mysql-test/connect/t/json_udf_bin.test
modified: storage/connect/mysql-test/connect/t/zip.test
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmgo.cpp
Change null representation from ??? to <null>
modified: storage/connect/json.cpp
Change the name of UDF that are equal to a native JSON function name
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
modified: storage/connect/mysql-test/connect/t/json_udf.inc
modified: storage/connect/mysql-test/connect/t/json_udf2.inc
Fix bug in making JSON project info
modified: storage/connect/mongofam.cpp
Fix COMPUTE when one argument is null
modified: storage/connect/value.cpp
Value is null only when nullable
modified: storage/connect/value.h
Diffstat (limited to 'storage/connect/jsonudf.h')
-rw-r--r-- | storage/connect/jsonudf.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/storage/connect/jsonudf.h b/storage/connect/jsonudf.h index d2890421c62..53fa555ee08 100644 --- a/storage/connect/jsonudf.h +++ b/storage/connect/jsonudf.h @@ -1,7 +1,7 @@ /******************** tabjson H Declares Source Code File (.H) *******************/ -/* Name: jsonudf.h Version 1.2 */ +/* Name: jsonudf.h Version 1.3 */ /* */ -/* (C) Copyright to the author Olivier BERTRAND 2015 */ +/* (C) Copyright to the author Olivier BERTRAND 2015-2017 */ /* */ /* This file contains the JSON UDF function and class declares. */ /*********************************************************************************/ @@ -37,9 +37,9 @@ extern "C" { DllExport char *jsonvalue(UDF_EXEC_ARGS); DllExport void jsonvalue_deinit(UDF_INIT*); - DllExport my_bool json_array_init(UDF_INIT*, UDF_ARGS*, char*); - DllExport char *json_array(UDF_EXEC_ARGS); - DllExport void json_array_deinit(UDF_INIT*); + DllExport my_bool json_make_array_init(UDF_INIT*, UDF_ARGS*, char*); + DllExport char *json_make_array(UDF_EXEC_ARGS); + DllExport void json_make_array_deinit(UDF_INIT*); DllExport my_bool json_array_add_values_init(UDF_INIT*, UDF_ARGS*, char*); DllExport char *json_array_add_values(UDF_EXEC_ARGS); @@ -53,9 +53,9 @@ extern "C" { DllExport char *json_array_delete(UDF_EXEC_ARGS); DllExport void json_array_delete_deinit(UDF_INIT*); - DllExport my_bool json_object_init(UDF_INIT*, UDF_ARGS*, char*); - DllExport char *json_object(UDF_EXEC_ARGS); - DllExport void json_object_deinit(UDF_INIT*); + DllExport my_bool json_make_object_init(UDF_INIT*, UDF_ARGS*, char*); + DllExport char *json_make_object(UDF_EXEC_ARGS); + DllExport void json_make_object_deinit(UDF_INIT*); DllExport my_bool json_object_nonull_init(UDF_INIT*, UDF_ARGS*, char*); DllExport char *json_object_nonull(UDF_EXEC_ARGS); @@ -232,7 +232,7 @@ extern "C" { /*********************************************************************************/ typedef struct _jpn { enum JTYP Type; - PSZ Key; + PCSZ Key; int N; } JPN, *PJPN; |