[Carob-commits] CVS update of libmysequoia/src (CarobMySQL.cpp MySQLAPI.cpp)

[csaba]

    Date: Thursday, June 8, 2006 @ 09:37:01
  Author: csaba
    Path: /cvsroot/carob/libmysequoia/src

Modified: CarobMySQL.cpp (1.74 -> 1.75) MySQLAPI.cpp (1.57 -> 1.58)

Implemented mysql_warning_count(). Fixes for LMS-15


----------------+
 CarobMySQL.cpp |    2 +-
 MySQLAPI.cpp   |   16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)


Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.74 
libmysequoia/src/CarobMySQL.cpp:1.75
--- libmysequoia/src/CarobMySQL.cpp:1.74        Fri Jun  2 10:24:08 2006
+++ libmysequoia/src/CarobMySQL.cpp     Thu Jun  8 09:37:01 2006
@@ -195,7 +195,7 @@
       LOG4CXX_DEBUG(logger, "Connect (first host): host=" << hti->host << " 
port=" << hti->port);
       port = hti->port;
       ConnectionParameters connectionParameters(to_wstring(hti->host), 
hti->port, 
-        to_wstring(db), to_wstring(user), to_wstring(passwd), ht.getPolicy(), 
DEFAULT_RETRY_INTERVAL, true);
+        to_wstring(db), to_wstring(user), to_wstring(passwd), ht.getPolicy(), 
DEFAULT_RETRY_INTERVAL, true, true);
       hti++;
       
       for (; hti != ht.end(); hti++)
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.57 libmysequoia/src/MySQLAPI.cpp:1.58
--- libmysequoia/src/MySQLAPI.cpp:1.57  Fri Jun  2 10:24:08 2006
+++ libmysequoia/src/MySQLAPI.cpp       Thu Jun  8 09:37:01 2006
@@ -833,7 +833,21 @@
 
   // TODO implementation
   unsigned int result = 0;
-  
+  MYSQL_RES *res;
+  MYSQL_ROW row;
+
+  if (mysql_query(mysql, "select @@warning_count") == 0)
+  {
+    if ((res = mysql_store_result(mysql)))
+    {
+      if ((row = mysql_fetch_row(res)))
+      {
+        result = atoi(row[0]);
+      }
+    }
+    mysql_free_result(res);
+  }
+
   LOG4CXX_DEBUG(logger, "Leaving mysql_warning_count: result=" << result);
   return result;
 }

_______________________________________________
Carob-commits mailing list
Carob-commits@lists.forge.continuent.org
https://forge.continuent.org/mailman/listinfo/carob-commits