From 614611d7c09dc3866078c46c6685ec34f33c8443 Mon Sep 17 00:00:00 2001 From: Olivier Bertrand Date: Sat, 26 Aug 2017 11:02:53 +0200 Subject: - Fix MDEV-13621 JDBC UPDATE containing single or double quote chars produces wrong result in ha_connect::GetStringOption modified: storage/connect/ha_connect.cc - Begin implement data type BINARY modified: storage/connect/ha_connect.cc modified: storage/connect/myutil.cpp modified: storage/connect/valblk.cpp modified: storage/connect/valblk.h modified: storage/connect/value.cpp - Fix MDEV-12422 CONNECT Engine to support CHECK TABLE Adding a fake check function returning HA_ADMIN_OK. modified: storage/connect/ha_connect.h - Treat TBL (thread) as local when connected to the current server and return by timeout when a TBL remote table connection fail (Thread only) modified: storage/connect/myconn.cpp modified: storage/connect/tabmysql.h modified: storage/connect/tabtbl.cpp modified: storage/connect/tabtbl.h - Update some tests and result files modified: storage/connect/mysql-test/connect/r/tbl_thread.result modified: storage/connect/mysql-test/connect/t/tbl_thread.test modified: storage/connect/mysql-test/connect/r/updelx.result - Add the GetCsName function modified: storage/connect/reldef.h --- storage/connect/myutil.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'storage/connect/myutil.cpp') diff --git a/storage/connect/myutil.cpp b/storage/connect/myutil.cpp index c2053f1c832..338a79d9455 100644 --- a/storage/connect/myutil.cpp +++ b/storage/connect/myutil.cpp @@ -218,7 +218,7 @@ int MYSQLtoPLG(int mytype, char *var) case MYSQL_TYPE_VARCHAR: #endif // !ALPHA) case MYSQL_TYPE_STRING: - type = TYPE_STRING; + type = (*var == 'B') ? TYPE_BIN : TYPE_STRING; break; case MYSQL_TYPE_BLOB: case MYSQL_TYPE_TINY_BLOB: @@ -232,7 +232,7 @@ int MYSQLtoPLG(int mytype, char *var) type = TYPE_STRING; *var = 'X'; } else - type = TYPE_ERROR; + type = TYPE_BIN; break; case TPC_SKIP: -- cgit v1.2.1