From df2675a9cc63d2a178a3b4a448c108088899a4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Tue, 19 Sep 2017 02:04:05 +0300 Subject: Merge connect/10.0 into 10.0 This is a squashed merge. --- storage/connect/tabutil.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'storage/connect/tabutil.cpp') diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp index 574cef28ea3..a2c04e2cf62 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') { -- cgit v1.2.1