|
Line
Link Here
|
| 0 |
-- src/sql/drivers/mysql/qsql_mysql.cpp |
0 |
++ src/sql/drivers/mysql/qsql_mysql.cpp |
|
Lines 37-43
Link Here
|
| 37 |
#include "qsql_mysql.h" |
37 |
#include "qsql_mysql.h" |
| 38 |
#include <private/qsqlextension_p.h> |
38 |
#include <private/qsqlextension_p.h> |
| 39 |
|
39 |
|
| 40 |
#include <qapplication.h> |
|
|
| 41 |
#include <qdatetime.h> |
40 |
#include <qdatetime.h> |
| 42 |
#include <qvaluevector.h> |
41 |
#include <qvaluevector.h> |
| 43 |
#include <qsqlrecord.h> |
42 |
#include <qsqlrecord.h> |
|
Lines 341-354
int QMYSQLResult::numRowsAffected()
Link Here
|
| 341 |
} |
340 |
} |
| 342 |
|
341 |
|
| 343 |
///////////////////////////////////////////////////////// |
342 |
///////////////////////////////////////////////////////// |
| 344 |
static void qServerEnd() |
|
|
| 345 |
{ |
| 346 |
#ifndef Q_NO_MYSQL_EMBEDDED |
| 347 |
# if MYSQL_VERSION_ID >= 40000 |
| 348 |
mysql_server_end(); |
| 349 |
# endif // MYSQL_VERSION_ID |
| 350 |
#endif // Q_NO_MYSQL_EMBEDDED |
| 351 |
} |
| 352 |
|
343 |
|
| 353 |
static void qServerInit() |
344 |
static void qServerInit() |
| 354 |
{ |
345 |
{ |
|
Lines 366-374
static void qServerInit()
Link Here
|
| 366 |
qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); |
357 |
qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); |
| 367 |
# endif |
358 |
# endif |
| 368 |
} |
359 |
} |
| 369 |
qAddPostRoutine(qServerEnd); |
|
|
| 370 |
init = TRUE; |
360 |
init = TRUE; |
| 371 |
|
|
|
| 372 |
# endif // MYSQL_VERSION_ID |
361 |
# endif // MYSQL_VERSION_ID |
| 373 |
#endif // Q_NO_MYSQL_EMBEDDED |
362 |
#endif // Q_NO_MYSQL_EMBEDDED |
| 374 |
} |
363 |
} |
|
Lines 411-416
QMYSQLDriver::~QMYSQLDriver()
Link Here
|
| 411 |
QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); |
400 |
QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); |
| 412 |
delete ext; |
401 |
delete ext; |
| 413 |
} |
402 |
} |
|
|
403 |
#ifndef Q_NO_MYSQL_EMBEDDED |
| 404 |
# if MYSQL_VERSION_ID > 40000 |
| 405 |
mysql_server_end(); |
| 406 |
# endif |
| 407 |
#endif |
| 414 |
} |
408 |
} |
| 415 |
|
409 |
|
| 416 |
bool QMYSQLDriver::hasFeature( DriverFeature f ) const |
410 |
bool QMYSQLDriver::hasFeature( DriverFeature f ) const |
