diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-05 10:59:15 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-05 10:59:15 +0200 |
| commit | a8b7b6c85b4817adafbd5258151f1ff21e7ac8ff (patch) | |
| tree | f6dc4d2dfbe19199affbf1fd9de548f94b52ea96 /storage/connect/jsonudf.cpp | |
| parent | 0599d80fccc000b3b4068f7acbb705f49188c55a (diff) | |
| parent | a99efc00a68fe2406343e63b67fc4ea58bed345a (diff) | |
| download | mariadb-git-a8b7b6c85b4817adafbd5258151f1ff21e7ac8ff.tar.gz | |
Commit merge resolved files
Diffstat (limited to 'storage/connect/jsonudf.cpp')
| -rw-r--r-- | storage/connect/jsonudf.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index ff4025ee0fb..0cd1e3a46f0 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -410,7 +410,11 @@ void Json_Array_Add_deinit(UDF_INIT* initid) } // end of Json_Array_Add_deinit /***********************************************************************/ +<<<<<<< HEAD /* Delete a value from a Json array. */ +======= +/* Add values to a Json array. */ +>>>>>>> MariaDB/10.0 /***********************************************************************/ my_bool Json_Array_Delete_init(UDF_INIT *initid, UDF_ARGS *args, char *message) { @@ -429,7 +433,11 @@ my_bool Json_Array_Delete_init(UDF_INIT *initid, UDF_ARGS *args, char *message) } // end of Json_Array_Delete_init char *Json_Array_Delete(UDF_INIT *initid, UDF_ARGS *args, char *result, +<<<<<<< HEAD unsigned long *res_length, char *, char *) +======= + unsigned long *res_length, char *is_null, char *error) +>>>>>>> MariaDB/10.0 { char *str; int n; @@ -451,7 +459,11 @@ char *Json_Array_Delete(UDF_INIT *initid, UDF_ARGS *args, char *result, } else { n = *(int*)args->args[1]; arp = jvp->GetArray(); +<<<<<<< HEAD arp->DeleteValue(n); +======= + arp->DeleteValue(n - 1); +>>>>>>> MariaDB/10.0 arp->InitArray(g); if (!(str = Serialize(g, arp, NULL, 0))) { |