diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-13 16:11:09 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-13 16:11:09 +0200 |
| commit | 4d5844d9dadeb208f4e430dfcea208d9234d1028 (patch) | |
| tree | d6950f7d8228f2dc7d24a5368eb313bbf335712e /storage/connect | |
| parent | 11ce35ea6316147f9a4683c20f89c20f6ca63602 (diff) | |
| download | mariadb-git-4d5844d9dadeb208f4e430dfcea208d9234d1028.tar.gz | |
Fix MDEV-13503 Modified: storage/connect/jdbconn.cpp
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/jdbconn.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp index 35df7ba75f7..cfe74cabacd 100644 --- a/storage/connect/jdbconn.cpp +++ b/storage/connect/jdbconn.cpp @@ -110,12 +110,13 @@ int TranslateJDBCType(int stp, char *tn, int prec, int& len, char& v) int type; switch (stp) { - case -1: // LONGVARCHAR - case -16: // LONGNVARCHAR (unicode) + case -1: // LONGVARCHAR, TEXT + case -16: // LONGNVARCHAR, NTEXT (unicode) if (GetTypeConv() != TPC_YES) return TYPE_ERROR; else len = MY_MIN(abs(len), GetConvSize()); + // Pass through case 12: // VARCHAR case -9: // NVARCHAR (unicode) v = 'V'; @@ -803,9 +804,10 @@ void JDBConn::SetColumnValue(int rank, PSZ name, PVAL val) switch (ctyp) { case 12: // VARCHAR case -9: // NVARCHAR - case -1: // LONGVARCHAR + case -1: // LONGVARCHAR, TEXT case 1: // CHAR case -15: // NCHAR + case -16: // LONGNVARCHAR, NTEXT case 3: // DECIMAL case -8: // ROWID if (jb && ctyp != 3) |