diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 02:04:05 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 02:05:11 +0300 |
| commit | df2675a9cc63d2a178a3b4a448c108088899a4e8 (patch) | |
| tree | 799367b62da41edace45b0864908b25424afc6e5 /storage/connect/tabutil.cpp | |
| parent | 0f44c8ab28adf0533595a417453765197deb4bfa (diff) | |
| download | mariadb-git-df2675a9cc63d2a178a3b4a448c108088899a4e8.tar.gz | |
Merge connect/10.0 into 10.0
This is a squashed merge.
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 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') { |