From ddd62ba24aa0c6f35b86a53ab6c3c97c67689ee6 Mon Sep 17 00:00:00 2001
From: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon, 18 Jan 2016 23:00:40 +0100
Subject: [PATCH] - Change SQL_NTS to 0 when the string is NULL   modified:  
 storage/connect/odbconn.cpp

---
 storage/connect/odbconn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp
index 1ccdf231970..3dbbcc845dc 100644
--- a/storage/connect/odbconn.cpp
+++ b/storage/connect/odbconn.cpp
@@ -2249,7 +2249,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
         rc = SQLTables(hstmt, name.ptr(2), name.length(2),
                               name.ptr(1), name.length(1),
                               name.ptr(0), name.length(0),
-                              cap->Pat, SQL_NTS);
+															cap->Pat, cap->Pat ? SQL_NTS : 0);
         break;
       case CAT_COL:
 //      rc = SQLSetStmtAttr(hstmt, SQL_ATTR_METADATA_ID,
@@ -2258,7 +2258,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
         rc = SQLColumns(hstmt, name.ptr(2), name.length(2),
                                name.ptr(1), name.length(1),
                                name.ptr(0), name.length(0),
-                               cap->Pat, SQL_NTS);
+															 cap->Pat, cap->Pat ? SQL_NTS : 0);
         break;
       case CAT_KEY:
         fnc = "SQLPrimaryKeys";