Modified:
MYODBCC/include/MYODBCC.h
MYSQLPlus/MYSQLPlusLib/MConnection.cpp
MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp
MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro
MYSQLPlus/include/M.h
Log:
Modified: MYODBCC/include/MYODBCC.h
===================================================================
--- MYODBCC/include/MYODBCC.h 2006-05-03 17:01:04 UTC (rev 187)
+++ MYODBCC/include/MYODBCC.h 2006-05-05 04:20:13 UTC (rev 188)
@@ -71,7 +71,7 @@
#include <windows.h>
#endif
-#include <string.h>
+// #include <string.h>
#include <sqltypes.h>
#include <odbcinst.h>
Modified: MYSQLPlus/MYSQLPlusLib/MConnection.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-03 17:01:04 UTC (rev 187)
+++ MYSQLPlus/MYSQLPlusLib/MConnection.cpp 2006-05-05 04:20:13 UTC (rev 188)
@@ -551,7 +551,6 @@
if ( nNameLength1 > SQL_MAX_DSN_LENGTH )
MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_HY090 ) );
-
QString stringServerName;
QString stringUserName;
QString stringAuthentication;
@@ -610,54 +609,54 @@
datasource.setScope( MYODBCInsDataSource::DATASOURCE_SCOPE_BOTH );
if ( !datasource.doRead( stringDSN ) )
MYODBCDbgReturn( pDiagnostic->doAppend( MDiagnostic::DIA_IM002 ) );
-
+
/*!
- \internal ODBC RULE
-
- Precedence for UID is;
- \li as provided to function
- \li as found in system information
-
+ \internal ODBC RULE
+
+ Precedence for UID is;
+ \li as provided to function
+ \li as found in system information
+
*/
if ( !stringUserName.isNull() )
datasource.setUID( stringUserName );
-
+
/*!
- \internal ODBC RULE
-
- Precedence for PWD is;
- \li as provided to function
- \li as found in system information
-
+ \internal ODBC RULE
+
+ Precedence for PWD is;
+ \li as provided to function
+ \li as found in system information
+
*/
if ( !stringAuthentication.isEmpty() )
datasource.setPWD( stringAuthentication );
-
+
/* allocate the MYSQL handle (this will silently do the library init as needed) */
pMySQL = mysql_init( NULL );
-
+
/* translate our flags into client while appling pre-connect flags */
ulong nFlags = getClientFlag( datasource.getOPTION().toULong(), datasource.getSTMT()
);
-
+
/* ask mysql for a connection */
if ( !mysql_real_connect( pMySQL,
- datasource.getSERVER().toUtf8().data(),
- datasource.getUID().toUtf8().data(),
- datasource.getPWD().toUtf8().data(),
- datasource.getDATABASE().toUtf8().data(),
- datasource.getPORT().toInt(),
- datasource.getSOCKET().toUtf8().data(),
- (uint)nFlags ) )
+ datasource.getSERVER().toUtf8().data(),
+ datasource.getUID().toUtf8().data(),
+ datasource.getPWD().toUtf8().data(),
+ datasource.getDATABASE().toUtf8().data(),
+ datasource.getPORT().toInt(),
+ datasource.getSOCKET().toUtf8().data(),
+ (uint)nFlags ) )
{
pDiagnostic->doAppend( MDiagnostic::DIA_HY000, mysql_errno( pMySQL ),
mysql_error( pMySQL ) );
mysql_close( pMySQL );
pMySQL = NULL;
MYODBCDbgReturn( SQL_ERROR );
}
-
+
if ( !datasource.getDATABASE().isEmpty() )
stringCurrentCatalog = datasource.getDATABASE();
-
+
nState = STATE_C4;
MYODBCDbgReturn( SQL_SUCCESS );
@@ -1195,7 +1194,7 @@
case CR_UNKNOWN_ERROR:
pDiagnostic->doAppend( MDiagnostic::DIA_01000, nReturn,
"CR_UNKNOWN_ERROR" );
break;
- case CR_SERVER_LOST: /* tbis is undocumented but as I recall it happens - PAH
*/
+ case CR_SERVER_LOST:
pDiagnostic->doAppend( MDiagnostic::DIA_01000, nReturn,
"CR_SERVER_LOST" );
break;
default:
Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp
===================================================================
--- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp 2006-05-03 17:01:04 UTC (rev 187)
+++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.cpp 2006-05-05 04:20:13 UTC (rev 188)
@@ -41,6 +41,9 @@
MConnection * pConnection = new MConnection( pEnvironment );
delete pEnvironment;
+
+ pConnection = NULL;
+ pEnvironment = NULL;
}
QTEST_MAIN( MYSQLPlusTest )
Modified: MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro
===================================================================
--- MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro 2006-05-03 17:01:04 UTC (rev 187)
+++ MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.pro 2006-05-05 04:20:13 UTC (rev 188)
@@ -13,6 +13,7 @@
INCLUDEPATH += ../include
LIBS += -L../../lib
LIBS += -lMYSQLPlus
+LIBS += -lMYODBCIns
LIBS += -lMYODBCDbg
LIBS += -lMYODBCC
@@ -20,6 +21,15 @@
include( ../../mysql.pri )
# #########################################################
+# WIN
+# #########################################################
+win32 {
+ LIBS += user32.lib
+ LIBS += /VERBOSE:LIB /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib
/NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib
+}
+
+
+# #########################################################
# FILES
# #########################################################
HEADERS =
Modified: MYSQLPlus/include/M.h
===================================================================
--- MYSQLPlus/include/M.h 2006-05-03 17:01:04 UTC (rev 187)
+++ MYSQLPlus/include/M.h 2006-05-05 04:20:13 UTC (rev 188)
@@ -3,6 +3,18 @@
#include <MYODBCC.h>
+#include <QObject>
+#include <QFile>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
+#include <QVariant>
+#include <QVector>
+#include <QByteArray>
+#include <QDateTime>
+
+#include <my_global.h>
#include <mysql.h>
#include <errmsg.h>
@@ -30,16 +42,6 @@
#define MYODBC_FLAG_NO_CACHE (MYODBC_FLAG_SAFE << 3) /* Don't cache the
resultset */
#define MYODBC_FLAG_FORWARD_CURSOR (MYODBC_FLAG_SAFE << 4) /* use forward only
cursor */
-#include <QObject>
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QTextStream>
-#include <QVariant>
-#include <QVector>
-#include <QDateTime>
-#include <QByteArray>
-
class MEnvironment;
class MConnection;
class MStatement;
| Thread |
|---|
| • Connector/ODBC 5 commit: r188 - MYODBCC/include MYSQLPlus/MYSQLPlusLib MYSQLPlus/MYSQLPlusTest MYSQLPlus/include | pharvey | 5 May |
