Connector/ODBC 5 commit: r804 - trunk/SDK/MYSQLPlus/Library

[jbalint]

Modified:
   trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
Log:
disabled multi-read on SQLGetData() w/"long" data for now (causes ADO issues)

Modified: trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp
===================================================================
--- trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-02-21 14:53:25 UTC (rev 803)
+++ trunk/SDK/MYSQLPlus/Library/MResult_data_toC.cpp	2007-02-21 18:30:46 UTC (rev 804)
@@ -168,11 +168,20 @@
                 MYODBCDbgReturn( SQL_NO_DATA );
 
             /* reset var-len data for next read if previous read is complete */
+            /* TODO enable this as a data-source option?
+             * It causes ADO problems, and fixes others,
+             * see bug#26213 and bug#26164 */
+            /*
             if ( stateGetData.nBytesRemaining == 0 )
             {
                 stateGetData.stringData.clear();
                 stateGetData.bytearrayData.clear();
             }
+            */
+            if ( stateGetData.nBytesRemaining == 0 )
+			{
+                MYODBCDbgReturn( SQL_NO_DATA );
+			}
 
             /*!
                 \internal