summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-07-30 13:15:54 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2015-07-30 13:15:54 +0200
commit7962add6c4d4ddf2928059fb4e009014f704b206 (patch)
tree451d520f594396608ca0729a0d7a2c94434acb81 /storage
parent4efcc35a317ddbd1d575bfb906e8214f5edfe026 (diff)
downloadmariadb-git-7962add6c4d4ddf2928059fb4e009014f704b206.tar.gz
Fix MDEV-8561 removing a wrong patch
modified: storage/connect/tabodbc.cpp
Diffstat (limited to 'storage')
-rw-r--r--storage/connect/tabodbc.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp
index 307509848f4..098ed1ac114 100644
--- a/storage/connect/tabodbc.cpp
+++ b/storage/connect/tabodbc.cpp
@@ -1268,9 +1268,10 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
} // endif Buf_Type
- // Handle null values
- if (Value->IsZero())
- Value->SetNull(Nullable);
+ // Nulls are handled by StrLen[n] == SQL_NULL_DATA
+ // MDEV-8561
+//if (Value->IsZero())
+// Value->SetNull(Nullable);
if (trace) {
char buf[64];