diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/dal/mysqldataprovider.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/dal/mysqldataprovider.cpp')
| -rw-r--r-- | src/dal/mysqldataprovider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dal/mysqldataprovider.cpp b/src/dal/mysqldataprovider.cpp index 9f9c4a93..626d5cc6 100644 --- a/src/dal/mysqldataprovider.cpp +++ b/src/dal/mysqldataprovider.cpp @@ -89,7 +89,7 @@ void MySqlDataProvider::connect() // allocate and initialize a new MySQL object suitable // for mysql_real_connect(). - mDb = mysql_init(NULL); + mDb = mysql_init(nullptr); if (!mDb) { @@ -108,7 +108,7 @@ void MySqlDataProvider::connect() password.c_str(), // password dbName.c_str(), // database name tcpPort, // tcp port - NULL, // socket, currently not used + nullptr, // socket, currently not used CLIENT_FOUND_ROWS)) // client flags { std::string msg(mysql_error(mDb)); |