Modified:
trunk/MYODBCC/include/MYODBCC.h
trunk/MYODBCDriver/MYODBCDriverLib/MYODBCDriverMain.cpp
trunk/MYODBCInstaller/main.cpp
trunk/MYODBCShell/main.cpp
trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp
trunk/MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp
trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
trunk/VersionInfo.h
trunk/connector-odbc.vpw
trunk/defines.pri
Log:
get version number sorted out for coming releases - using VersionInfo.h
Modified: trunk/MYODBCC/include/MYODBCC.h
===================================================================
--- trunk/MYODBCC/include/MYODBCC.h 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/MYODBCC/include/MYODBCC.h 2006-06-06 19:27:05 UTC (rev 320)
@@ -59,6 +59,8 @@
'include' directory are not moved or copied.
*/
+#include "../../VersionInfo.h"
+
/*!
\brief ODBC Version
Modified: trunk/MYODBCDriver/MYODBCDriverLib/MYODBCDriverMain.cpp
===================================================================
--- trunk/MYODBCDriver/MYODBCDriverLib/MYODBCDriverMain.cpp 2006-06-06 05:33:08 UTC (rev
319)
+++ trunk/MYODBCDriver/MYODBCDriverLib/MYODBCDriverMain.cpp 2006-06-06 19:27:05 UTC (rev
320)
@@ -74,12 +74,17 @@
Trace output is turned on/off by one of the following methods;
1. MYODBC_LOG connection attribute via DSN or connect string.
- 2. MYODBC_LOG environment variable set to empty or file name.
+ 2. MYODBC_LOG environment variable set to "off" or file name.
The default behaviour is to have the trace go to stdout. Set
MYODBC_LOG to a file
- name to send it to a file. Set MYODBC_LOG to an empty value (empty
string) to
- turn trace output off.
+ name to send it to a file. Set MYODBC_LOG to "off" to turn trace
output off.
+ Examples;
+
+ set MYODBC_LOG=off
+ set MYODBC_LOG=C:\myodbc_log.txt
+ set MYODBC_LOG=stdout
+
\note
MyODBC trace is aside from any trace produced by the Driver Manager
(DM). The DM
Modified: trunk/MYODBCInstaller/main.cpp
===================================================================
--- trunk/MYODBCInstaller/main.cpp 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/MYODBCInstaller/main.cpp 2006-06-06 19:27:05 UTC (rev 320)
@@ -50,7 +50,7 @@
int doShowSyntax()
{
std::cout << "+---" << std::endl;
- std::cout << "| MYODBCInstaller v" << MYODBC_DRIVER_VER <<
std::endl;
+ std::cout << "| MYODBCInstaller v" << MYODBC_VERSION << std::endl;
std::cout << "+---" << std::endl;
std::cout << "|" << std::endl;
std::cout << "| Description" << std::endl;
Modified: trunk/MYODBCShell/main.cpp
===================================================================
--- trunk/MYODBCShell/main.cpp 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/MYODBCShell/main.cpp 2006-06-06 19:27:05 UTC (rev 320)
@@ -39,7 +39,7 @@
int doShowSyntax( QTextStream *pstream )
{
(*pstream) << "+---" << endl;
- (*pstream) << "| MYODBCShell v" << MYODBC_DRIVER_VER << endl;
+ (*pstream) << "| MYODBCShell v" << MYODBC_VERSION << endl;
(*pstream) << "+---" << endl;
(*pstream) << "|" << endl;
(*pstream) << "| Syntax" << endl;
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-06-06 19:27:05 UTC (rev 320)
@@ -1008,7 +1008,7 @@
break;
case SQL_DRIVER_VER:
{
- QString stringVersion( MYODBC_DRIVER_VER );
+ QString stringVersion( MYODBC_VERSION );
bCopyOk = MYODBCC::doStringCopyOut( (SQLWCHAR*)pInfoValue, nBufferLength,
(SQLWCHAR*)stringVersion.utf16(), &nStringLengthChars );
*pnStringLengthBytes = nStringLengthChars * sizeof(SQLWCHAR);
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MDiagnosticRecord.cpp 2006-06-06 19:27:05 UTC (rev 320)
@@ -274,7 +274,7 @@
MYODBCDbgReturn3( "%s", (QString( "[%1][%2 %3][%4] %5 %6" )
.arg( MYODBC_VENDOR )
.arg( MYODBC_NAME )
- .arg( MYODBC_DRIVER_VER )
+ .arg( MYODBC_VERSION )
.arg( MYODBC_VENDOR )
.arg( nNative )
.arg( MDiagnostic_pStates[nState].stringText )) );
@@ -283,7 +283,7 @@
MYODBCDbgReturn3( "%s", (QString( "[%1][%2 %3][%4] %5 %6" )
.arg( MYODBC_VENDOR )
.arg( MYODBC_NAME )
- .arg( MYODBC_DRIVER_VER )
+ .arg( MYODBC_VERSION )
.arg( MYODBC_VENDOR )
.arg( nNative )
.arg( stringMessage )) );
@@ -296,7 +296,7 @@
MYODBCDbgReturn3( "%s", QString( "[%1][%2 %3][%4] %5" )
.arg( MYODBC_VENDOR )
.arg( MYODBC_NAME )
- .arg( MYODBC_DRIVER_VER )
+ .arg( MYODBC_VERSION )
.arg( MDiagnostic_pStates[nState].stringSQLState )
.arg( MDiagnostic_pStates[nState].stringText ) );
}
@@ -304,7 +304,7 @@
MYODBCDbgReturn3( "%s", QString( "[%1][%2 %3][%4] %5" )
.arg( MYODBC_VENDOR )
.arg( MYODBC_NAME )
- .arg( MYODBC_DRIVER_VER )
+ .arg( MYODBC_VERSION )
.arg( MDiagnostic_pStates[nState].stringSQLState )
.arg( stringMessage ) );
}
Modified: trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp
===================================================================
--- trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/MYSQLPlus/MYSQLPlusLib/MResult.cpp 2006-06-06 19:27:05 UTC (rev 320)
@@ -308,7 +308,6 @@
case SQL_DECIMAL:
case SQL_NUMERIC:
case SQL_TINYINT:
- case SQL_TINYINT:
case SQL_SMALLINT:
case SQL_INTEGER:
case SQL_BIGINT:
@@ -766,9 +765,9 @@
MYODBCDbgReturn( toWideCharStringC() );
case SQL_C_STINYINT:
-
case SQL_C_UTINYINT:
case SQL_C_TINYINT:
+
case SQL_C_SBIGINT:
case SQL_C_UBIGINT:
case SQL_C_SSHORT:
Modified: trunk/VersionInfo.h
===================================================================
--- trunk/VersionInfo.h 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/VersionInfo.h 2006-06-06 19:27:05 UTC (rev 320)
@@ -16,11 +16,32 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
-#define MYODBC_VERSION "5.00.00"
-#define MYODBC_FILEVER 5,00,00,0
-#define MYODBC_PRODUCTVER 5,00,00,0
-#define MYODBC_STRFILEVER "5, 00, 00, 0\0"
-#define MYODBC_STRPRODUCTVER "5, 00, 00, 0\0"
+/*!
+ \name Version
+ This is where we set the version. We must increment the version with each release
+ we make.
+
+ Our convention is to keep the majour and minor in synch with the MySQL server we
+ are building against. We use the 3rd number as the release number and this is reset
+ when the majour or minor changes. We do not use the 4th number - it is always 0.
+
+ This is picked up by the Windows rc files and is used in some areas of the
+ source.
+
+ \todo
+
+ We should get these from the make files. So config.h for GNU build, defines.pri for
+ qmake build.
+*/
+/*@{*/
+#define MYODBC_VERSION "5.00.03"
+#define MYODBC_FILEVER 5,00,03,0
+#define MYODBC_PRODUCTVER 5,00,03,0
+#define MYODBC_STRFILEVER "5, 00, 03, 0\0"
+#define MYODBC_STRPRODUCTVER "5, 00, 03, 0\0"
+/*@}*/
+
Modified: trunk/connector-odbc.vpw
===================================================================
--- trunk/connector-odbc.vpw 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/connector-odbc.vpw 2006-06-06 19:27:05 UTC (rev 320)
@@ -2,7 +2,7 @@
<Workspace Version="10.0" VendorName="SlickEdit">
<Projects>
<Project File="dltest/dltest.vpj" />
- <Project File="../connector-odbc3/myodbc3S/myodbc3S.vpj" />
+ <Project File="../../connector-odbc3/myodbc3S/myodbc3S.vpj" />
<Project File="MYODBCC/MYODBCC.vpj" />
<Project File="MYODBCC/MYODBCCLib/MYODBCCLib.vpj" />
<Project File="MYODBCC/MYODBCCTest/MYODBCCTest.vpj" />
@@ -22,7 +22,7 @@
<Project File="MYODBCShell/MYODBCShell.vpj" />
<Project File="MYODBCTst/MYODBCTst.vpj" />
<Project File="MYODBCTst/MYODBCTstLib/MYODBCTstLib.vpj" />
- <Project File="../mysql-include.vpj" />
+ <Project File="../../mysql-include.vpj" />
<Project File="MYSQLPlus/MYSQLPlus.vpj" />
<Project File="MYSQLPlus/MYSQLPlusLib/MYSQLPlusLib.vpj" />
<Project File="MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.vpj" />
Modified: trunk/defines.pri
===================================================================
--- trunk/defines.pri 2006-06-06 05:33:08 UTC (rev 319)
+++ trunk/defines.pri 2006-06-06 19:27:05 UTC (rev 320)
@@ -12,7 +12,6 @@
DEFINES += MYODBC_VENDOR=\"MySQL\"
DEFINES += MYODBC_NAME=\"MyODBC\"
-DEFINES += MYODBC_DRIVER_VER=\"05.00.0002\"
win32 {
DEFINES += MYODBC_DRIVER_NAME=\"MYODBCDriver5.dll\"
@@ -22,55 +21,47 @@
}
# #########################################################
-# Set this to the majour version number.
-# #########################################################
-# DEFINES += MYODBC_VER_MAJOUR=5
-
-# #########################################################
-# Set this to the minor version number.
-# #########################################################
-# DEFINES += MYODBC_VER_MINOR=00
-
-# #########################################################
-# Set this to the release number.
-# #########################################################
-# DEFINES += MYODBC_VER_RELEASE=2
-
-# #########################################################
-# Use this to remove some sanity checks which may only be
-# useful during application development.
+# MYODBC_DEV
+# =========================================================
#
+# Use this to adjust sanity checking.
+#
# 0 = to get modest performance improvements
# 1 = to enable more sanity checks in the code
+#
# #########################################################
DEFINES += MYODBC_DEV=1
# #########################################################
+# MYODBC_DBG
+# =========================================================
+#
# Use this to turn debugging features on;
#
# 0 = no debugging output from driver
# 1 = entry/exit debugging output from driver
# 2 = same as 1 but also prints out function args
#
-# Use the MYODBC_DBG_FILE environment variable to state where the
+# Use the MYODBC_LOG environment variable to state where the
# debugging output should go. This only has an affect when
# the code has been built with MYODBC_DBG > 0.
#
# Some examples;
#
-# $ set MYODBC_DBG_FILE= (turns off debugging)
-# $ set MYODBC_DBG_FILE=stderr (output to stderr)
-# $ set MYODBC_DBG_FILE=c:\myodbc.txt (create/replace file)
-# $ set MYODBC_DBG_FILE=/tmp/myodbc.txt (create/replace file)
+# $ set MYODBC_LOG=off (turns off debugging)
+# $ set MYODBC_LOG=stderr (output to stderr)
+# $ set MYODBC_LOG=c:\myodbc.txt (create/replace file)
+# $ set MYODBC_LOG=/tmp/myodbc.txt (create/replace file)
#
# Note: Building code with MYODBC_DBG>0 will result in slightly
-# slower code - even when it is turned on by setting
-# MYODBC_DBG_FILE to nothing.
+# slower code - even when it is turned off by setting
+# MYODBC_LOG=off.
+#
# #########################################################
DEFINES += MYODBC_DBG=2
# #########################################################
-# Enable/disable UNICODE build option.
+# Enable/disable UNICODE build option (we should not need this).
# #########################################################
# DEFINES += UNICODE _UNICODE
@@ -82,3 +73,4 @@
LIBS += $(LDFLAGS)
}
+
| Thread |
|---|
| • Connector/ODBC 5 commit: r320 - in trunk: . MYODBCC/include MYODBCDriver/MYODBCDriverLib MYODBCInstaller MYODBCShell MYSQLPlus/MYSQLPlusLib | pharvey | 6 Jun |
