Connector/ODBC 5 commit: r259 - MYSQLPlus/MYSQLPlusLib

[pharvey]

Modified:
   MYSQLPlus/MYSQLPlusLib/MResult.cpp
Log:


Modified: MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-05-19 06:50:17 UTC (rev 258)
+++ MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-05-19 15:10:42 UTC (rev 259)
@@ -1113,8 +1113,8 @@
     if ( resultGetData.pTargetValue && resultGetData.nBytesMax )
         *((short int*)(resultGetData.pTarget)) = (short
int)resultGetData.variantData.toInt();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1128,8 +1128,8 @@
 
     *resultGetData.pTarget = (unsigned short int)resultGetData.variantData.toUInt();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1143,8 +1143,8 @@
 
     *resultGetData.pTarget = (long int)resultGetData.variantData.toLongLong();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1158,8 +1158,8 @@
 
     *pTarget = (unsigned long int)resultGetData.variantData.toULongLong();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1173,8 +1173,8 @@
 
     *resultGetData.pTarget = (float)resultGetData.variantData.toDouble();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1188,8 +1188,8 @@
 
     *resultGetData.pTarget = (double)resultGetData.variantData.toDouble();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1203,8 +1203,8 @@
 
     *resultGetData.pTarget = resultGetData.variantData.toInt();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1218,8 +1218,8 @@
 
     *resultGetData.pTarget = resultGetData.variantData.toInt();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1235,8 +1235,8 @@
 
     *pnInt64 = (qint64)resultGetData.variantData.toLongLong();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1252,8 +1252,8 @@
 
     *pnUInt64 = (quint64)resultGetData.variantData.toLongLong();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1305,8 +1305,8 @@
     pDateTarget->month  = d.month();
     pDateTarget->year   = d.year();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1325,8 +1325,8 @@
     pTimeTarget->minute = t.minute();
     pTimeTarget->second = t.second();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1349,8 +1349,8 @@
     pTimeStampTarget->second     = t.time().second();
     pTimeStampTarget->year       = t.date().year();
 
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     MYODBCDbgReturn( SQL_SUCCESS );
 }
@@ -1484,8 +1484,8 @@
     /*! \todo pack into 16 byte buffer */
 
     /* set length */
-    resultGetData.nBytesRemaining = 0;
-    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining =
resultGetData.nBytesRemaining;
+    variantData.clear();
+    if ( resultGetData.pnBytesRemaining ) *resultGetData.pnBytesRemaining = 0;
 
     if ( bFractionalTruncation )
         MYODBCDbgReturn( getDiagnostic()->doAppend( MDiagnostic::DIA_01S07 ) );