diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 20:22:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 20:22:30 +0200 |
| commit | 1320ad5b9253256afe98e948d25ed0a423a1e6da (patch) | |
| tree | 97369f9aa107f08568e1647c3c6cbfeaabf3feea /storage/connect/tabutil.cpp | |
| parent | 88adfd0cea34b93b50d6cc1128df45bae2124bc2 (diff) | |
| parent | ca3c8d9b58fdc267b7c4df1ce3afde5ec6599344 (diff) | |
| download | mariadb-git-1320ad5b9253256afe98e948d25ed0a423a1e6da.tar.gz | |
Merge branch '10.2' into bb-10.2-ext
Diffstat (limited to 'storage/connect/tabutil.cpp')
| -rw-r--r-- | storage/connect/tabutil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp index 9ab3d5e8806..e17e092661f 100644 --- a/storage/connect/tabutil.cpp +++ b/storage/connect/tabutil.cpp @@ -120,7 +120,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db, FLD_REM, FLD_NO, FLD_CHARSET}; unsigned int length[] = {0, 4, 16, 4, 4, 4, 4, 4, 0, 32, 32}; PCSZ fmt; - char *pn, *tn, *fld, *colname, *chset, v; + char *pn, *tn, *fld, *colname, v; //, *chset; int i, n, ncol = sizeof(buftyp) / sizeof(int); int prec, len, type, scale; int zconv = GetConvSize(); @@ -185,7 +185,7 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db, colname = (char *)fp->field_name.str; crp->Kdata->SetValue(colname, i); - chset = (char *)fp->charset()->name; +// chset = (char *)fp->charset()->name; // v = (!strcmp(chset, "binary")) ? 'B' : 0; v = 0; |