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

- Fix MDEV-15735 CONNECT [filamtxt.cpp:429]: Suspicious condition

Browse Source 
modified:   storage/connect/filamtxt.cpp

- Fix MDEV-15577 CONNECT engine JDBC remote index prevents UPDATE
  Fixed in TDBJDBC::OpenDB because query can be null for updates
  modified:   storage/connect/tabjdbc.cpp

- Fix wrong updates of 10.3 distribution
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabjson.cpp

- Typo from 10.3
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/tabext.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/user_connect.cc
This commit is contained in:
Olivier Bertrand
2018-05-07 00:56:45 +02:00
parent e37df0f95a
commit fa7bbe5a73
8 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/connect/jsonudf.cpp
View File

@@ -41,8 +41,6 @@ static PJSON JsonNew(PGLOBAL g, JTYP type);
static PJVAL JvalNew(PGLOBAL g, JTYP type, void *vp = NULL);
static PJSNX JsnxNew(PGLOBAL g, PJSON jsp, int type, int len = 64);
void json_array_deinit(UDF_INIT* initid);
static uint JsonGrpSize = 10;
/*********************************************************************************/
@@ -1669,7 +1667,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
int j = 0, n = args->attribute_lengths[i];
my_bool b; // true if attribute is zero terminated
PSZ p;
const char *s = args->attributes[i];
PCSZ s = args->attributes[i];
if (s && *s && (n || *s == '\'')) {
if ((b = (!n || !s[n])))
@@ -1688,7 +1686,7 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
} // endif *s
if (n < 1)
return (char*) "Key";
return "Key";
if (!b) {
if ((p = (PSZ)PlgDBSubAlloc(g, NULL, n + 1))) {
@@ -1702,10 +1700,10 @@ static PCSZ MakeKey(PGLOBAL g, UDF_ARGS *args, int i)
} // endif s
return (char*) s;
return s;
} // endif count
return (char*) "Key";
return "Key";
} // end of MakeKey
/*********************************************************************************/