diff options
| author | Monty <monty@mariadb.org> | 2019-04-19 13:15:46 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-04-19 13:17:14 +0300 |
| commit | a024649081412c58039b19998a26937ade2796f8 (patch) | |
| tree | b6d7c0902a81d8efc5f4f2a9b9166e14ccc13325 /storage/connect/tabmysql.cpp | |
| parent | 4233b28489826ffeebcc828aa6eb171d6f57ccdb (diff) | |
| download | mariadb-git-a024649081412c58039b19998a26937ade2796f8.tar.gz | |
Fixed compiler warnings form gcc 7.3.1
Diffstat (limited to 'storage/connect/tabmysql.cpp')
| -rw-r--r-- | storage/connect/tabmysql.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index ceffafac02c..83c20b26701 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -1259,7 +1259,7 @@ MYSQLCOL::MYSQLCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am) MYSQLCOL::MYSQLCOL(MYSQL_FIELD *fld, PTDB tdbp, int i, PCSZ am) : COLBLK(NULL, tdbp, i) { - const char *chset = get_charset_name(fld->charsetnr); +//const char *chset = get_charset_name(fld->charsetnr); //char v = (!strcmp(chset, "binary")) ? 'B' : 0; char v = 0; @@ -1400,6 +1400,7 @@ void MYSQLCOL::ReadColumn(PGLOBAL g) /* If physical fetching of the line was deferred, do it now. */ /*********************************************************************/ if (!tdbp->Fetched) + { if ((rc = tdbp->Myc.Fetch(g, tdbp->N)) != RC_OK) { if (rc == RC_EF) sprintf(g->Message, MSG(INV_DEF_READ), rc); @@ -1407,7 +1408,7 @@ void MYSQLCOL::ReadColumn(PGLOBAL g) throw 11; } else tdbp->Fetched = true; - + } if ((buf = ((PTDBMY)To_Tdb)->Myc.GetCharField(Rank))) { if (trace(2)) htrc("MySQL ReadColumn: name=%s buf=%s\n", Name, buf); |