diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-06 19:23:06 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-06 19:23:06 +0200 |
| commit | 7482f073ae8677e7fcfd2bb60087bd76dfc8a8d9 (patch) | |
| tree | 355110fe62a30245363e96b9790fccd08d5a0e92 /storage/connect/jsonudf.cpp | |
| parent | 1c756512b0d67e39961ee3c54872af5041f08248 (diff) | |
| download | mariadb-git-7482f073ae8677e7fcfd2bb60087bd76dfc8a8d9.tar.gz | |
Commit od last modifications made for version 10.0
Diffstat (limited to 'storage/connect/jsonudf.cpp')
| -rw-r--r-- | storage/connect/jsonudf.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index 23cef5cb99b..ff4025ee0fb 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -410,11 +410,7 @@ 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. */ ->>>>>>> ob-10.1 /***********************************************************************/ my_bool Json_Array_Delete_init(UDF_INIT *initid, UDF_ARGS *args, char *message) { @@ -455,11 +451,7 @@ 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); ->>>>>>> ob-10.1 arp->InitArray(g); if (!(str = Serialize(g, arp, NULL, 0))) { |