diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-08 17:36:54 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-08 17:36:54 +0200 |
| commit | 4d4ba60c6e7a589b0dc54de108cbd4204b6b3b6a (patch) | |
| tree | dfa6bf9f1e5b9b98f9ffe4295f633bf45b7a4d04 /storage | |
| parent | 017d9ccf5d623abb07b354f41aea63e6327decf2 (diff) | |
| download | mariadb-git-4d4ba60c6e7a589b0dc54de108cbd4204b6b3b6a.tar.gz | |
- Fix MDEV-13463 unescape table name during detection of table structure
modified: storage/connect/myconn.cpp
- Remove a few gcc warnings
modified: storage/connect/jmgoconn.cpp
modified: storage/connect/json.h
modified: storage/connect/tabjson.cpp
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/jmgoconn.cpp | 4 | ||||
| -rw-r--r-- | storage/connect/json.h | 2 | ||||
| -rw-r--r-- | storage/connect/myconn.cpp | 6 | ||||
| -rw-r--r-- | storage/connect/tabjson.cpp | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/storage/connect/jmgoconn.cpp b/storage/connect/jmgoconn.cpp index a51127c80a0..7535431c82e 100644 --- a/storage/connect/jmgoconn.cpp +++ b/storage/connect/jmgoconn.cpp @@ -732,7 +732,7 @@ int JMgoConn::DocUpdate(PGLOBAL g, PTDB tdbp) return RC_FX; if (env->CallBooleanMethod(job, docaddid, updlist, jkey, val)) - return NULL; + return RC_OK; env->DeleteLocalRef(jkey); } // endfor colp @@ -742,7 +742,7 @@ int JMgoConn::DocUpdate(PGLOBAL g, PTDB tdbp) jkey = env->NewStringUTF("$set"); if (env->CallBooleanMethod(job, docaddid, upd, jkey, updlist)) - return NULL; + return RC_OK; env->DeleteLocalRef(jkey); diff --git a/storage/connect/json.h b/storage/connect/json.h index 26e69fe0995..cf7b2b18737 100644 --- a/storage/connect/json.h +++ b/storage/connect/json.h @@ -53,6 +53,8 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char *fn, int pretty); bool SerializeArray(JOUT *js, PJAR jarp, bool b); bool SerializeObject(JOUT *js, PJOB jobp); bool SerializeValue(JOUT *js, PJVAL jvp); +bool IsNum(PSZ s); +char *NextChr(PSZ s, char sep); /***********************************************************************/ /* Class JOUT. Used by Serialize. */ diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp index e68489faad5..d2d55f33611 100644 --- a/storage/connect/myconn.cpp +++ b/storage/connect/myconn.cpp @@ -139,7 +139,7 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db, unsigned int length[] = {0, 4, 0, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0}; PCSZ fmt; char *fld, *colname, *chset, v, buf[128], uns[16], zero[16]; - int i, n, nf, ncol = sizeof(buftyp) / sizeof(int); + int i, n, nf = 0, ncol = sizeof(buftyp) / sizeof(int); int len, type, prec, rc, k = 0; bool b; PQRYRES qrp; @@ -160,7 +160,9 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db, /* Do an evaluation of the result size. */ /********************************************************************/ STRING cmd(g, 64, "SHOW FULL COLUMNS FROM "); - b = cmd.Append((PSZ)table); + b = cmd.Append('`'); + b |= cmd.Append((PSZ)table); + b |= cmd.Append('`'); b |= cmd.Append(" FROM "); b |= cmd.Append((PSZ)(db ? db : PlgGetUser(g)->DBName)); diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp index 07361957465..5556985770e 100644 --- a/storage/connect/tabjson.cpp +++ b/storage/connect/tabjson.cpp @@ -54,8 +54,6 @@ /* External functions. */ /***********************************************************************/ USETEMP UseTemp(void); -bool IsNum(PSZ s); -char *NextChr(PSZ s, char sep); char *GetJsonNull(void); typedef struct _jncol { |