Date: Thursday, December 8, 2005 @ 14:37:56
Author: csaba
Path: /cvsroot/carob/libmysequoia/src
Modified: CarobMySQL.cpp (1.11 -> 1.12)
The testing if the port is 0 is only made once in the function not on every
function call.
----------------+
CarobMySQL.cpp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.11
libmysequoia/src/CarobMySQL.cpp:1.12
--- libmysequoia/src/CarobMySQL.cpp:1.11 Thu Dec 8 13:41:02 2005
+++ libmysequoia/src/CarobMySQL.cpp Thu Dec 8 14:37:56 2005
@@ -78,19 +78,22 @@
if (!host || !*host)
host = "localhost";
+ if (!port)
+ port = 25322;
+
/* Check for delayed connection. If db name not given, the connection can't
happen, because sequoia doesn't support it.
* The real connection will happen after the user call the command
mysql_select_db or mysql_real_connect */
if (!db || !*db)
{
delete_connection(false);
- set_connect_info(host, user, passwd, 0, port ? port : 25322);
+ set_connect_info(host, user, passwd, 0, port);
return true;
}
try
{
- ConnectionParameters connectionParameters(fromString(host), port ? port :
25322,
+ ConnectionParameters connectionParameters(fromString(host), port,
fromString(db), fromString(user), fromString(passwd), DEBUG_LEVEL_DEBUG);
Connection *newConnectionPtr =
connectionPool->connectToController(connectionParameters);
@@ -98,7 +101,7 @@
{
//TODO handle not enough memory
delete_connection(false);
- set_connect_info(host, user, passwd, db, port ? port : 25322);
+ set_connect_info(host, user, passwd, db, port);
connectionPtr = newConnectionPtr;
stmtPtr = connectionPtr->createStatement();
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
