diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-21 08:12:19 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-21 08:12:19 +0300 |
| commit | e3d44f5d62672478c40294d6e46d9f066e418cac (patch) | |
| tree | 44b4d1b9d94ced780d4f369f84eddc36791470be /storage/connect/myutil.cpp | |
| parent | d176be8aeaecdb20a963fbd126929ddcd5bd98f3 (diff) | |
| parent | f70865bc9e540767d8afc3cc2cbe0e1c92a8c0be (diff) | |
| download | mariadb-git-e3d44f5d62672478c40294d6e46d9f066e418cac.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/connect/myutil.cpp')
| -rw-r--r-- | storage/connect/myutil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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: |