Date: Friday, November 17, 2006 @ 19:34:23
Author: csaba
Path: /cvsroot/carob/libmysequoia/src
Modified: CarobCommon.cpp (1.11 -> 1.12) CarobMySQL.cpp (1.89 -> 1.90)
CarobStmt.cpp (1.43 -> 1.44) MySQLAPI.cpp (1.62 -> 1.63)
Utils.cpp (1.44 -> 1.45)
Fix compilation errors on x86_64 platform. Fixes for LMS-33
-----------------+
CarobCommon.cpp | 2 +-
CarobMySQL.cpp | 2 +-
CarobStmt.cpp | 2 +-
MySQLAPI.cpp | 6 ++++--
Utils.cpp | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
Index: libmysequoia/src/CarobCommon.cpp
diff -u libmysequoia/src/CarobCommon.cpp:1.11
libmysequoia/src/CarobCommon.cpp:1.12
--- libmysequoia/src/CarobCommon.cpp:1.11 Tue Apr 18 11:50:34 2006
+++ libmysequoia/src/CarobCommon.cpp Fri Nov 17 19:34:23 2006
@@ -30,7 +30,7 @@
using namespace CarobNS;
using namespace log4cxx;
-LoggerPtr CarobCommon::logger(Logger::getLogger("MySQLAPI.Carob"));
+LoggerPtr CarobCommon::logger(Logger::getLogger(_T("MySQLAPI.Carob")));
void
CarobCommon::convert_to_pchar(const std::wstring &src, char * &result,
unsigned int &length)
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.89
libmysequoia/src/CarobMySQL.cpp:1.90
--- libmysequoia/src/CarobMySQL.cpp:1.89 Wed Nov 8 11:51:48 2006
+++ libmysequoia/src/CarobMySQL.cpp Fri Nov 17 19:34:23 2006
@@ -197,7 +197,7 @@
for (hti = ht.begin(); hti != ht.end(); hti++)
{
ctrls.push_back(ControllerInfo(to_wstring(hti->host), hti->port));
- LOG4CXX_DEBUG(logger, "Connect (adding host): host=" << hti->host << "
port=" << hti->port);
+ LOG4CXX_DEBUG(logger, _T("Connect (adding host): host=") <<
hti->host.c_str() << _T(" port=") << hti->port);
}
// we can retrieve the warnings only if we have persistent connection
Index: libmysequoia/src/CarobStmt.cpp
diff -u libmysequoia/src/CarobStmt.cpp:1.43 libmysequoia/src/CarobStmt.cpp:1.44
--- libmysequoia/src/CarobStmt.cpp:1.43 Fri Nov 10 14:08:06 2006
+++ libmysequoia/src/CarobStmt.cpp Fri Nov 17 19:34:23 2006
@@ -120,7 +120,7 @@
}
} catch (BackendException &e)
{
- LOG4CXX_DEBUG(logger, "Prepare: errno=" << e.getErrorCode() << "
error=" << from_wstring(e.description()));
+ LOG4CXX_DEBUG(logger, _T("Prepare: errno=") << e.getErrorCode() <<
_T(" error=") << from_wstring(e.description()).c_str());
}
}
catch (BackendException &e)
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.62 libmysequoia/src/MySQLAPI.cpp:1.63
--- libmysequoia/src/MySQLAPI.cpp:1.62 Mon Nov 6 16:11:07 2006
+++ libmysequoia/src/MySQLAPI.cpp Fri Nov 17 19:34:23 2006
@@ -49,7 +49,7 @@
using namespace log4cxx;
using namespace log4cxx::helpers;
-LoggerPtr logger(Logger::getLogger("MySQLAPI"));
+LoggerPtr logger(Logger::getLogger(_T("MySQLAPI")));
CriticalSection library_init;
static bool library_initialized = false;
@@ -159,6 +159,7 @@
char *home_dir = getenv("HOME");
bool found = false;
std::string s;
+ StringBuffer sbuf;
// initialize logging
if (home_dir && !found)
@@ -180,7 +181,8 @@
if (!found)
s = std::string(DEFAULT_LOGGER_CONFIG_FILE);
- PropertyConfigurator::configure(s.c_str());
+ sbuf << s.c_str();
+ PropertyConfigurator::configure(sbuf.str());
LOG4CXX_DEBUG(logger, "Entering mysql_server_init: argc=" << argc << "
argv=" << argv << " groups=" << groups);
Index: libmysequoia/src/Utils.cpp
diff -u libmysequoia/src/Utils.cpp:1.44 libmysequoia/src/Utils.cpp:1.45
--- libmysequoia/src/Utils.cpp:1.44 Fri Nov 10 14:24:33 2006
+++ libmysequoia/src/Utils.cpp Fri Nov 17 19:34:23 2006
@@ -43,7 +43,7 @@
using namespace std;
using namespace log4cxx;
-static LoggerPtr logger(Logger::getLogger("MySQLAPI.Carob"));
+static LoggerPtr logger(Logger::getLogger(_T("MySQLAPI.Carob")));
const char *error_sqlstate[]=
{
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
