 | | | bk commit - Connector/ODBC 3.53 (1.51) | bk commit - Connector/ODBC 3.53 (1.51) 2005-04-28 - By pharvey@(protected)
Back
Below is the list of changes that have just been commited into a local
MyODBC 3.53 repository of 'pharvey'. When 'pharvey' does a push, they will
be propogaged to the main repository and within 2 hours after the push
into the public repository.
For more information on how to access the public repository see:
http://www.mysql.com/products/myodbc/faq_2.html#Development_source
You can also browse the changes from public repository:
Complete repository: http://mysql.bkbits.net:8080/myodbc-3.53/
This changeset : http://mysql.bkbits.net:8080/myodbc-3.53/cset@(protected)
ChangeSet
1.51 05/04/28 17:48:30 pharvey@(protected) +17 -0
- improved passing global build options
- started building unit test for MYODBCDrv
myodbc-3.53.vpj
1.4 05/04/28 17:48:29 pharvey@(protected) +1 -0
- improved passing global build options
- started building unit test for MYODBCDrv
myodbc-3.53.pro
1.13 05/04/28 17:48:29 pharvey@(protected) +38 -0
- improved passing global build options
- started building unit test for MYODBCDrv
defines.qmake
1.2 05/04/28 17:48:29 pharvey@(protected) +34 -1
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.pro
1.5 05/04/28 17:48:29 pharvey@(protected) +1 -6
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCRes/MYODBCResLib/MYODBCResLib.pro
1.13 05/04/28 17:48:29 pharvey@(protected) +1 -2
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCRes/MYODBCRes.vpj
1.7 05/04/28 17:48:29 pharvey@(protected) +1 -1
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCList/MYODBCListLib/MYODBCListLib.pro
1.6 05/04/28 17:48:29 pharvey@(protected) +1 -2
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCIns/MYODBCInsLib/MYODBCInsLib.pro
1.12 05/04/28 17:48:29 pharvey@(protected) +1 -5
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCDrv/MYODBCDrvLib/MYODBCDrvLib.pro
1.10 05/04/28 17:48:29 pharvey@(protected) +1 -7
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCDrv/MYODBCDrvLib/MYODBCDrvDisassociateDes.c
1.2 05/04/28 17:48:29 pharvey@(protected) +2 -2
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCDrv/MYODBCDrv.pro
1.10 05/04/28 17:48:29 pharvey@(protected) +3 -1
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCDia/MYODBCDiaLib/MYODBCDiaLib.pro
1.16 05/04/28 17:48:29 pharvey@(protected) +1 -2
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCDes/MYODBCDesLib/MYODBCDesLib.pro
1.12 05/04/28 17:48:29 pharvey@(protected) +1 -2
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCDes/MYODBCDesLib/MYODBCDesAlloc.c
1.16 05/04/28 17:48:29 pharvey@(protected) +25 -22
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro
1.9 05/04/28 17:48:29 pharvey@(protected) +1 -2
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCC/MYODBCCLib/MYODBCCLib.pro
1.11 05/04/28 17:48:29 pharvey@(protected) +1 -2
- improved passing global build options
- started building unit test for MYODBCDrv
MYODBCArray/MYODBCArrayLib/MYODBCArrayLib.pro
1.15 05/04/28 17:48:29 pharvey@(protected) +1 -2
- improved passing global build options
- started building unit test for MYODBCDrv
defines.qmake
1.1 05/04/28 13:06:47 pharvey@(protected) +8 -0
defines.qmake
1.0 05/04/28 13:06:46 pharvey@(protected) +0 -0
BitKeeper file /home/pharvey/SandBox/MySQL/myodbc-3.53/defines.qmake
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: pharvey
# Host: thinkpad.peterharvey.org
# Root: /home/pharvey/SandBox/MySQL/myodbc-3.53
--- 1.1/MYODBCDrv/MYODBCDrvLib/MYODBCDrvDisassociateDes.c 2005-03-29 18:11:12
-08:00
+++ 1.2/MYODBCDrv/MYODBCDrvLib/MYODBCDrvDisassociateDes.c 2005-04-28 17:48:29
-07:00
@@ -23,7 +23,7 @@
/* cleanup desc if not used by other stmt */
if ( !MYODBCDrvIsDesWithStm( pDes ) )
{
- myodbc_free_desc_extras( pDes );
+ MYODBCDrvFreeDesExtras( pDes );
pDes->nTypeSubID = MYODBC_RTTI_DES_UND;
}
}
@@ -38,7 +38,7 @@
/* cleanup desc if not used by other stmt */
if ( !MYODBCDrvIsDesWithStm( pDes ) )
{
- myodbc_free_desc_extras( pDes );
+ MYODBCDrvFreeDesExtras( pDes );
pDes->nTypeSubID = MYODBC_RTTI_DES_UND;
}
}
--- 1.9/MYODBCDrv/MYODBCDrvLib/MYODBCDrvLib.pro 2005-04-28 11:31:01 -07:00
+++ 1.10/MYODBCDrv/MYODBCDrvLib/MYODBCDrvLib.pro 2005-04-28 17:48:29 -07:00
@@ -4,15 +4,9 @@
TEMPLATE = lib
TARGET = MYODBCDrv
CONFIG += thread warn_on debug
-# CONFIG += dll
CONFIG += plugin
-DEFINES += MYODBC_VER_MAJOUR=$(MYODBC_VER_MAJOUR)
-DEFINES += MYODBC_VER_MINOR=$(MYODBC_VER_MINOR)
-DEFINES += MYODBC_VER_RELEASE=$(MYODBC_VER_RELEASE)
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
-# !win32:VERSION = 3.53-1
OBJECTS_DIR = .tmp
INCLUDEPATH += ../../MYODBCC/include
INCLUDEPATH += ../../MYODBCRtti/include
--- 1.4/MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.pro 2005-04-28 11:31:02 -07:00
+++ 1.5/MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.pro 2005-04-28 17:48:29 -07:00
@@ -35,13 +35,8 @@
TARGET = MYODBCSetup
CONFIG += qt thread warn_on debug
CONFIG += plugin
-DEFINES += MYODBC_VER_MAJOUR=$(MYODBC_VER_MAJOUR)
-DEFINES += MYODBC_VER_MINOR=$(MYODBC_VER_MINOR)
-DEFINES += MYODBC_VER_RELEASE=$(MYODBC_VER_RELEASE)
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
-!win32:VERSION = 3.53-1
UI_DIR = .tmp
MOC_DIR = .tmp
OBJECTS_DIR = .tmp
--- 1.3/myodbc-3.53.vpj 2005-03-22 14:00:28 -08:00
+++ 1.4/myodbc-3.53.vpj 2005-04-28 17:48:29 -07:00
@@ -64,6 +64,7 @@
<Folder
Name="Other Files"
Filters="">
+ <F N="defines.qmake"/>
<F N="doxygen.config"/>
<F N="myodbc-3.53.pro"/>
</Folder>
--- 1.11/MYODBCIns/MYODBCInsLib/MYODBCInsLib.pro 2005-04-28 11:31:01 -07:00
+++ 1.12/MYODBCIns/MYODBCInsLib/MYODBCInsLib.pro 2005-04-28 17:48:29 -07:00
@@ -5,11 +5,7 @@
TARGET = MYODBCIns
CONFIG += thread warn_on debug
CONFIG += staticlib
-DEFINES += MYODBC_VER_MAJOUR=$(MYODBC_VER_MAJOUR)
-DEFINES += MYODBC_VER_MINOR=$(MYODBC_VER_MINOR)
-DEFINES += MYODBC_VER_RELEASE=$(MYODBC_VER_RELEASE)
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
OBJECTS_DIR = .tmp
INCLUDEPATH += ../../MYODBCC/include
--- 1.6/MYODBCRes/MYODBCRes.vpj 2005-03-22 14:00:28 -08:00
+++ 1.7/MYODBCRes/MYODBCRes.vpj 2005-04-28 17:48:29 -07:00
@@ -22,7 +22,7 @@
CaptureOutputWith="ProcessBuffer"
SaveOption="SaveWorkspaceFiles"
RunFromDir="%rw">
- <Exec/>
+ <Exec CmdLine="qmake;make"/>
</Target>
<Target
Name="Rebuild"
--- 1.5/MYODBCList/MYODBCListLib/MYODBCListLib.pro 2005-04-28 11:31:02 -07:00
+++ 1.6/MYODBCList/MYODBCListLib/MYODBCListLib.pro 2005-04-28 17:48:29 -07:00
@@ -5,8 +5,7 @@
TARGET = MYODBCList
CONFIG += thread warn_on debug
CONFIG += staticlib
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
OBJECTS_DIR = .tmp
INCLUDEPATH += ../../MYODBCC/include
--- New file ---
+++ defines.qmake 05/04/28 13:06:46
# #########################################################
#
# \brief These settings are used when building
# Connector/ODBC using the qmake utility.
#
# Edit these settings before using qmake to
# generate the Makefiles.
#
# \sa myodbc-3.53.pro
#
# #########################################################
# #########################################################
# Set this to the majour version number.
# #########################################################
DEFINES += MYODBC_VER_MAJOUR=3
# #########################################################
# Set this to the minor version number.
# #########################################################
DEFINES += MYODBC_VER_MINOR=53
# #########################################################
# Set this to the release number.
# #########################################################
DEFINES += MYODBC_VER_RELEASE=1
# #########################################################
# Set this to 1 to enabled sanity checks in the code. Set
# this to 0 to get modest performance improvments.
# #########################################################
DEFINES += MYODBC_DEV=1
# #########################################################
# Set this to 1 to enable debug output. This is mostly useful
# for debugging the driver itself. Set this to 0 to improve
# the performance of the driver and remove debug output.
# #########################################################
DEFINES += MYODBC_DBG=1
--- 1.9/MYODBCDrv/MYODBCDrv.pro 2005-04-26 16:11:28 -07:00
+++ 1.10/MYODBCDrv/MYODBCDrv.pro 2005-04-28 17:48:29 -07:00
@@ -1,4 +1,6 @@
TEMPLATE = subdirs
SUBDIRS = \
- MYODBCDrvLib
+ MYODBCDrvLib \
+ MYODBCDrvTest
+
--- 1.12/myodbc-3.53.pro 2005-03-22 14:00:28 -08:00
+++ 1.13/myodbc-3.53.pro 2005-04-28 17:48:29 -07:00
@@ -1,3 +1,41 @@
+# #########################################################
+#
+# \brief This is the top-level qmake project file for building
+# Connector/ODBC.
+#
+# This method of building Connector/ODBC is an alternative
+# to the GNU auto-tool method. The advantage of using qmake
+# is that it is portable across all platforms - including
+# MS Windows. Also; most people find the qmake project files
+# easier to understand.
+#
+# However; qmake is not as powerfull as the GNU auto-tools and,
+# on some platforms, the GNU auto-tool method is the standard
+# expected by the community at large.
+#
+# The qmake utility comes with the Qt class library from
+# TrollTech. It processes qmake project files (?.pro) to create
+# a Makefile which can be understood by make/nmake.
+#
+# Before using qmake to process this file - you need to verify
+# that the settings in *.qmake files are correct. There will
+# 1 or more of these in the root of the source directory.
+#
+# Edit the *.qmake file(s) as needed and then do the following
+# while in the root source directory (on Windows you may want
+# to use nmake instead of make);
+#
+# $ qmake
+# $ make
+#
+# \note The qmake utility can be told to generate Visual Studio project
+# files instead of just generating a Makefile. See the qmake
+# documentation for more on qmake.
+#
+# \sa defines.qmake
+# http://www.trolltech.com
+#
+# #########################################################
TEMPLATE = subdirs
SUBDIRS = \
MYODBCC \
--- 1.14/MYODBCArray/MYODBCArrayLib/MYODBCArrayLib.pro 2005-04-28 11:31:00 -07
:00
+++ 1.15/MYODBCArray/MYODBCArrayLib/MYODBCArrayLib.pro 2005-04-28 17:48:29 -07
:00
@@ -5,8 +5,7 @@
TARGET = MYODBCArray
CONFIG += thread warn_on debug
CONFIG += staticlib
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
OBJECTS_DIR = .tmp
INCLUDEPATH += ../../MYODBCC/include
--- 1.10/MYODBCC/MYODBCCLib/MYODBCCLib.pro 2005-04-28 11:31:00 -07:00
+++ 1.11/MYODBCC/MYODBCCLib/MYODBCCLib.pro 2005-04-28 17:48:29 -07:00
@@ -5,8 +5,7 @@
TARGET = MYODBCC
CONFIG += thread warn_on debug
CONFIG += staticlib
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
OBJECTS_DIR = .tmp
--- 1.8/MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro 2005-04-28 11:31:00 -07:00
+++ 1.9/MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.pro 2005-04-28 17:48:29 -07:00
@@ -5,8 +5,7 @@
TARGET = MYODBCDbg
CONFIG += thread warn_on debug
CONFIG += staticlib
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
OBJECTS_DIR = .tmp
DESTDIR = ../../lib
INCLUDEPATH += ../../MYODBCC/include
--- 1.11/MYODBCDes/MYODBCDesLib/MYODBCDesLib.pro 2005-04-28 11:31:00 -07:00
+++ 1.12/MYODBCDes/MYODBCDesLib/MYODBCDesLib.pro 2005-04-28 17:48:29 -07:00
@@ -5,8 +5,7 @@
TARGET = MYODBCDes
CONFIG += thread warn_on debug
CONFIG += staticlib
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
OBJECTS_DIR = .tmp
INCLUDEPATH += ../../MYODBCC/include
--- 1.15/MYODBCDes/MYODBCDesLib/MYODBCDesAlloc.c 2005-04-20 16:07:34 -07:00
+++ 1.16/MYODBCDes/MYODBCDesLib/MYODBCDesAlloc.c 2005-04-28 17:48:29 -07:00
@@ -15,31 +15,34 @@
MYODBC_DES_PTR MYODBCDesAlloc( SQLHANDLE hOwner, MYODBC_RTTI_DES_TYPE nDesType
)
{
MYODBC_DES_PTR pDes = NULL;
- int nOwnerType = MYODBCRttiType( hOwner );
- /*!
- \internal MYODBC Rule
+ if ( hOwner )
+ {
+ int nOwnerType = MYODBCRttiType( hOwner );
+ /*!
+ \internal MYODBC Rule
- An undefined descriptor type is to handle case where we are
- creating a descriptor explicitly and is for dbc owner only.
+ An undefined descriptor type is to handle case where we are
+ creating a descriptor explicitly and is for dbc owner only.
- Other descriptor types must be owned by a statement.
- */
- switch ( nDesType )
- {
- case MYODBC_RTTI_DES_UND:
- if ( nOwnerType != MYODBC_RTTI_DBC )
- return NULL;
- break;
- case MYODBC_RTTI_DES_APD:
- case MYODBC_RTTI_DES_IPD:
- case MYODBC_RTTI_DES_ARD:
- case MYODBC_RTTI_DES_IRD:
- if ( nOwnerType != MYODBC_RTTI_STM )
+ Other descriptor types must be owned by a statement.
+ */
+ switch ( nDesType )
+ {
+ case MYODBC_RTTI_DES_UND:
+ if ( nOwnerType != MYODBC_RTTI_DBC )
+ return NULL;
+ break;
+ case MYODBC_RTTI_DES_APD:
+ case MYODBC_RTTI_DES_IPD:
+ case MYODBC_RTTI_DES_ARD:
+ case MYODBC_RTTI_DES_IRD:
+ if ( nOwnerType != MYODBC_RTTI_STM )
+ return NULL;
+ break;
+ default:
return NULL;
- break;
- default:
- return NULL;
+ }
}
/* alloc descriptor */
@@ -47,7 +50,7 @@
/* init header fields to most common values */
pDes->nTypeID = MYODBC_RTTI_DES;
- pDes->nTypeSubID = nDesType;
+ pDes->nTypeSubID = nDesType;
pDes->hDia = MYODBCDiaAlloc();
pDes->extra = NULL;
--- 1.15/MYODBCDia/MYODBCDiaLib/MYODBCDiaLib.pro 2005-04-28 11:31:00 -07:00
+++ 1.16/MYODBCDia/MYODBCDiaLib/MYODBCDiaLib.pro 2005-04-28 17:48:29 -07:00
@@ -5,8 +5,7 @@
TARGET = MYODBCDia
CONFIG += thread warn_on debug
CONFIG += staticlib
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
OBJECTS_DIR = .tmp
INCLUDEPATH += ../../MYODBCC/include
--- 1.12/MYODBCRes/MYODBCResLib/MYODBCResLib.pro 2005-04-28 11:31:02 -07:00
+++ 1.13/MYODBCRes/MYODBCResLib/MYODBCResLib.pro 2005-04-28 17:48:29 -07:00
@@ -5,8 +5,7 @@
TARGET = MYODBCRes
CONFIG += thread warn_on debug
CONFIG += staticlib
-DEFINES += MYODBC_DEV=$(MYODBC_DEV)
-DEFINES += MYODBC_DBG=$(MYODBC_DBG)
+include( ../../defines.qmake )
DESTDIR = ../../lib
OBJECTS_DIR = .tmp
INCLUDEPATH += ../../MYODBCC/include
--
MySQL ODBC Mailing List
For list archives: http://lists.mysql.com/myodbc
To unsubscribe: http://lists.mysql.com/myodbc?unsub=mysql@(protected)
Earn $52 per hosting referral at Lunarpages.
|
|
|