diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-20 17:47:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-20 17:47:49 +0300 |
| commit | fc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670 (patch) | |
| tree | d3f4f28b6bb2ffa6e6c4b19e6c03f2e209590171 /storage/connect/tabutil.cpp | |
| parent | 4cfef2a5a4157269244923637032c21ff67b0161 (diff) | |
| parent | 96f06f952d087bd47225cc2784edbb0510fad818 (diff) | |
| download | mariadb-git-fc3b1a7d2fcc45c05aa19ea35e1d7978b4f90670.tar.gz | |
Merge 10.2 into bb-10.2-ext
Diffstat (limited to 'storage/connect/tabutil.cpp')
| -rw-r--r-- | storage/connect/tabutil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp index 158cf744a4a..9ab3d5e8806 100644 --- a/storage/connect/tabutil.cpp +++ b/storage/connect/tabutil.cpp @@ -186,7 +186,8 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db, crp->Kdata->SetValue(colname, i); chset = (char *)fp->charset()->name; - v = (!strcmp(chset, "binary")) ? 'B' : 0; +// v = (!strcmp(chset, "binary")) ? 'B' : 0; + v = 0; if ((type = MYSQLtoPLG(fp->type(), &v)) == TYPE_ERROR) { if (v == 'K') { |