From 37d19b88f84990cc40b11bb297dadbdb6b2c8e7a Mon Sep 17 00:00:00 2001
From: Israel Lins <israelins85@yahoo.com.br>
Date: Sun, 17 Mar 2013 23:20:55 -0300
Subject: ODBC: lost info about column metadata on SQL_NO_DATA

In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata
is ignored.

Change-Id: I0501fa47c42754bba42b3531da59e66c696eac53
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit f9d856b3f5a4ceaeb8a5ac88aad2ad6b9e540abf)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
---
 src/sql/drivers/odbc/qsql_odbc.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 5ff8e975ee..24357d2ea1 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -966,11 +966,6 @@ bool QODBCResult::reset (const QString& query)
         return false;
     }
 
-    if(r == SQL_NO_DATA) {
-        setSelect(false);
-        return true;
-    }
-
     SQLULEN isScrollable = 0;
     SQLINTEGER bufferLength;
     r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, &bufferLength);
-- 
cgit v1.2.1