summaryrefslogtreecommitdiff
path: root/storage/connect/myconn.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2017-08-08 17:36:54 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2017-08-08 17:36:54 +0200
commit4d4ba60c6e7a589b0dc54de108cbd4204b6b3b6a (patch)
treedfa6bf9f1e5b9b98f9ffe4295f633bf45b7a4d04 /storage/connect/myconn.cpp
parent017d9ccf5d623abb07b354f41aea63e6327decf2 (diff)
downloadmariadb-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/connect/myconn.cpp')
-rw-r--r--storage/connect/myconn.cpp6
1 files changed, 4 insertions, 2 deletions
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));