diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-09-04 22:32:02 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-09-04 22:32:02 +0200 |
| commit | 7e65bdba7b1e6f5aa7ac08d5c886b04c53c4da50 (patch) | |
| tree | e9b49bfe9d96ae52a387f8370d74191bcc8cff99 /storage/connect/tabutil.cpp | |
| parent | 703ce16a114c6bc4665f596f7331d1a1f33da94f (diff) | |
| download | mariadb-git-7e65bdba7b1e6f5aa7ac08d5c886b04c53c4da50.tar.gz | |
- Update version number
modified: storage/connect/ha_connect.cc
- Regard columns with binary charset as string (was binary)
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabutil.cpp
- Support length 0 for CHAR and VARCHAR
modified: storage/connect/ha_connect.cc
modified: storage/connect/reldef.cpp
modified: storage/connect/value.cpp
- Add ACCEPT option for void columns in discovery
modified: storage/connect/tabjson.cpp
- Update some tests because of above change
modified: storage/connect/mysql-test/connect/r/json_java_2.result
modified: storage/connect/mysql-test/connect/r/json_java_3.result
modified: storage/connect/mysql-test/connect/r/json_mongo_c.result
modified: storage/connect/mysql-test/connect/r/mongo_c.result
modified: storage/connect/mysql-test/connect/r/mongo_java_2.result
modified: storage/connect/mysql-test/connect/r/mongo_java_3.result
modified: storage/connect/mysql-test/connect/r/odbc_oracle.result
modified: storage/connect/mysql-test/connect/r/updelx.result
modified: storage/connect/mysql-test/connect/t/mongo_test.inc
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') { |