Connector/ODBC 5 commit: r315 - / MYSQLPlus/MYSQLPlusLib

[pharvey]

Modified:
   Install.bat
   MYSQLPlus/MYSQLPlusLib/MResult.cpp
   MYSQLPlus/MYSQLPlusLib/MResult.h
   Uninstall.bat
Log:


Modified: Install.bat
===================================================================
--- Install.bat	2006-06-02 14:34:07 UTC (rev 314)
+++ Install.bat	2006-06-04 05:55:53 UTC (rev 315)
@@ -15,24 +15,24 @@
 GOTO doSyntax
 
 :doNormal
-IF EXIST \Windows\System32\MYODBCDriver5.dll GOTO :doError4
+IF EXIST %SystemRoot%\System32\MYODBCDriver5.dll GOTO :doError4
 IF NOT EXIST lib\MYODBCDriver5.dll GOTO :doError2
 REM IF NOT EXIST lib\MYODBCSetup5.dll GOTO :doError2
 
 REM ****
 REM * Copying myodbc libraries and executables to install dir...
 REM ****
-copy lib\MYODBCDriver5.dll \Windows\System32
-copy lib\MYODBCDriver5.lib \Windows\System32
-REM copy lib\MYODBCSetup5.dll \Windows\System32
-REM copy lib\MYODBCSetup5.lib \Windows\System32
+copy lib\MYODBCDriver5.dll %SystemRoot%\System32
+copy lib\MYODBCDriver5.lib %SystemRoot%\System32
+REM copy lib\MYODBCSetup5.dll %SystemRoot%\System32
+REM copy lib\MYODBCSetup5.lib %SystemRoot%\System32
 
 REM \todo "Program Files\MySQL\Connector ODBC 5\bin"
-REM copy bin\MYODBCInstaller.exe \Windows\System32
-REM copy bin\MYODBCShell.exe \Windows\System32
+REM copy bin\MYODBCInstaller.exe %SystemRoot%\System32
+REM copy bin\MYODBCShell.exe %SystemRoot%\System32
 
 REM \todo "Program Files\MySQL\Connector ODBC 5\doc"
-REM copy doc\*.hlp \Windows\System32
+REM copy doc\*.hlp %SystemRoot%\System32
 
 REM ****
 REM * Registering driver...
@@ -49,16 +49,16 @@
 GOTO doSuccess
 
 :doDebug
-IF EXIST \Windows\System32\MYODBCDriver5d.dll GOTO :doError4
+IF EXIST %SystemRoot%\System32\MYODBCDriver5d.dll GOTO :doError4
 IF NOT EXIST lib\MYODBCDriver5d.dll goto doError3
 IF NOT EXIST lib\MYODBCSetup5d.dll goto doError3
 REM ****
 REM * Copying myodbc debug libraries to install dir...
 REM ****
-copy lib\MYODBCDriver5d.dll \Windows\System32
-copy lib\MYODBCDriver5d.lib \Windows\System32
-copy lib\MYODBCSetup5d.dll \Windows\System32
-copy lib\MYODBCSetup5d.lib \Windows\System32
+copy lib\MYODBCDriver5d.dll %SystemRoot%\System32
+copy lib\MYODBCDriver5d.lib %SystemRoot%\System32
+copy lib\MYODBCSetup5d.dll %SystemRoot%\System32
+copy lib\MYODBCSetup5d.lib %SystemRoot%\System32
 
 REM ****
 REM * Registering driver...

Modified: MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-06-02 14:34:07 UTC (rev 314)
+++ MYSQLPlus/MYSQLPlusLib/MResult.cpp	2006-06-04 05:55:53 UTC (rev 315)
@@ -308,6 +308,7 @@
         case SQL_DECIMAL:
         case SQL_NUMERIC:
         case SQL_TINYINT:
+        case SQL_TINYINT:
         case SQL_SMALLINT:
         case SQL_INTEGER:
         case SQL_BIGINT:
@@ -765,6 +766,7 @@
             MYODBCDbgReturn( toWideCharStringC() );
 
         case SQL_C_STINYINT:
+
         case SQL_C_UTINYINT:
         case SQL_C_TINYINT:
         case SQL_C_SBIGINT:

Modified: MYSQLPlus/MYSQLPlusLib/MResult.h
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MResult.h	2006-06-02 14:34:07 UTC (rev 314)
+++ MYSQLPlus/MYSQLPlusLib/MResult.h	2006-06-04 05:55:53 UTC (rev 315)
@@ -55,9 +55,9 @@
             addresses is the fact that we can have a resultset generated in a variety
             of ways - each with their own unique quirks.
 
-    \sa     MResultDriver
-            MResultClient
-            MResultServer
+    \sa     MResultPlus
+            MResultRes
+            MResultStmt
 */
 class MResult : public QObject
 {
@@ -167,7 +167,7 @@
     SQLRETURN       fromIntervalYearMonthSQL();
     SQLRETURN       fromIntervalDayTimeSQL();
 
-    /* support for getData: these do the conversion */
+    /* support for getData: these do data conversion going out (to app) */
     SQLRETURN       toCharStringC();
     SQLRETURN       toWideCharStringC();
     SQLRETURN       toShortIntC();

Modified: Uninstall.bat
===================================================================
--- Uninstall.bat	2006-06-02 14:34:07 UTC (rev 314)
+++ Uninstall.bat	2006-06-04 05:55:53 UTC (rev 315)
@@ -15,7 +15,7 @@
 GOTO doSyntax
 
 :doNormal
-IF NOT EXIST \Windows\System32\MYODBCDriver5.dll GOTO :doError2
+IF NOT EXIST %SystemRoot%\System32\MYODBCDriver5.dll GOTO :doError2
 REM ****
 REM * Deregistering driver...
 REM ****
@@ -24,19 +24,19 @@
 REM ****
 REM * Removing files...
 REM ****
-del /Q /F \Windows\System32\MYODBC*5.*
+del /Q /F %SystemRoot%\System32\MYODBC*5.*
 
 REM \todo "Program Files\MySQL\Connector ODBC 5\bin"
-REM del /Q /F \Windows\System32\MYODBCInstaller.exe
-REM del /Q /F \Windows\System32\MYODBCShell.exe
+REM del /Q /F %SystemRoot%\System32\MYODBCInstaller.exe
+REM del /Q /F %SystemRoot%\System32\MYODBCShell.exe
 
 REM \todo "Program Files\MySQL\Connector ODBC 5\doc"
-REM del /Q /F \Windows\System32\MYODBC*5.hlp
+REM del /Q /F %SystemRoot%\System32\MYODBC*5.hlp
 
 GOTO doSuccess
 
 :doDebug
-IF NOT EXIST \Windows\System32\MYODBCDriver5d.dll GOTO :doError3
+IF NOT EXIST %SystemRoot%\System32\MYODBCDriver5d.dll GOTO :doError3
 REM ****
 REM * Deregistering driver...
 REM ****
@@ -45,7 +45,7 @@
 REM ****
 REM * Removing files...
 REM ****
-del /Q /F \Windows\System32\MYODBC*5d.dll
+del /Q /F %SystemRoot%\System32\MYODBC*5d.dll
 GOTO doSuccess
 
 :doSuccess