Merge branch 'ob-10.0' into 10.0

8ab46a51 · Olivier Bertrand · 701af14b · 7962add6 · 8ab46a51
Commit 8ab46a51 authored Jul 30, 2015 by Olivier Bertrand
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

storage/connect/tabodbc.cpp storage/connect/tabodbc.cpp +4 -3

No files found.
--- 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];