database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Commit merge resolved files

Browse Source
This commit is contained in:
Olivier Bertrand
2015-06-05 10:59:15 +02:00
parent 0599d80fcc a99efc00a6
commit a8b7b6c85b
1197 changed files with 55725 additions and 25228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
storage/connect/jsonudf.cpp
View File

@@ -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))) {