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

[csaba]

    Date: Friday, June 2, 2006 @ 10:24:08
  Author: csaba
    Path: /cvsroot/carob/libmysequoia/src

Modified: CarobMySQL.cpp (1.73 -> 1.74) MySQLAPI.cpp (1.56 -> 1.57)


----------------+
 CarobMySQL.cpp |   18 +++++++++---------
 MySQLAPI.cpp   |    6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)


Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.73 
libmysequoia/src/CarobMySQL.cpp:1.74
--- libmysequoia/src/CarobMySQL.cpp:1.73        Wed Apr 19 08:54:27 2006
+++ libmysequoia/src/CarobMySQL.cpp     Fri Jun  2 10:24:08 2006
@@ -663,7 +663,7 @@
   {
     set_error(CR_COMMANDS_OUT_OF_SYNC, SQLT_UNKNOWN);
     LOG4CXX_DEBUG(logger, "Leaving set_autocommit: result=0");
-    return 0;
+    return false;
   }
   
   try
@@ -681,20 +681,20 @@
     {
       set_error(e);
       LOG4CXX_DEBUG(logger, "Leaving set_autocommit: result=0");
-      return 0;
+      return false;
     }          
     catch (CarobException &e)
     {
       set_error(e.getErrorCode(), from_wstring(e.description()).c_str(), 
from_wstring(e.getSQLState()).c_str());
       LOG4CXX_DEBUG(logger, "Leaving set_autocommit: result=0");
-      return 0;
+      return false;
     }
   }
   catch (ConverterException &e)
   {
     set_error(0, e.description().c_str(), error_sqlstate[SQLT_UNKNOWN]);
     LOG4CXX_DEBUG(logger, "Leaving set_autocommit: result=0");
-    return 0;
+    return false;
   }
 }
 
@@ -707,7 +707,7 @@
   {
     set_error(CR_COMMANDS_OUT_OF_SYNC, SQLT_UNKNOWN);
     LOG4CXX_DEBUG(logger, "Leaving commit: result=0");
-    return 0;
+    return false;
   }
   
   try
@@ -725,20 +725,20 @@
     {
       set_error(e);
       LOG4CXX_DEBUG(logger, "Leaving commit: result=0");
-      return 0;
+      return false;
     }              
     catch (CarobException &e)
     {
       set_error(e.getErrorCode(), from_wstring(e.description()).c_str(), 
from_wstring(e.getSQLState()).c_str());
       LOG4CXX_DEBUG(logger, "Leaving commit: result=0");
-      return 0;
+      return false;
     }
   }
   catch (ConverterException &e)
   {
     set_error(0, e.description().c_str(), error_sqlstate[SQLT_UNKNOWN]);
     LOG4CXX_DEBUG(logger, "Leaving commit: result=0");
-    return 0;
+    return false;
   }
 }
 
@@ -782,7 +782,7 @@
   {
     set_error(0, e.description().c_str(), error_sqlstate[SQLT_UNKNOWN]);
     LOG4CXX_DEBUG(logger, "Leaving rollback: result=0");
-    return 0;
+    return false;
   }
 }
 
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.56 libmysequoia/src/MySQLAPI.cpp:1.57
--- libmysequoia/src/MySQLAPI.cpp:1.56  Thu May 11 08:05:00 2006
+++ libmysequoia/src/MySQLAPI.cpp       Fri Jun  2 10:24:08 2006
@@ -979,7 +979,7 @@
 {
   LOG4CXX_DEBUG(logger, "Entering mysql_autocommit: mysql=" << mysql << " 
auto_mode=" << (bool) auto_mode);
 
-  my_bool result = mysql ? getCarob(mysql)->set_autocommit(auto_mode) : 0;
+  my_bool result = mysql ? getCarob(mysql)->set_autocommit(auto_mode) ? 0 : 1 
: 1;
 
   LOG4CXX_DEBUG(logger, "Leaving mysql_autocommit: result=" << (bool) result);
   return result;
@@ -991,7 +991,7 @@
 {
   LOG4CXX_DEBUG(logger, "Entering mysql_commit: mysql=" << mysql);
 
-  my_bool result = mysql ? getCarob(mysql)->commit() : 0;
+  my_bool result = mysql ? getCarob(mysql)->commit() ? 0 : 1 : 1;
 
   LOG4CXX_DEBUG(logger, "Leaving mysql_commit: result=" << (bool) result);
   return result;
@@ -1003,7 +1003,7 @@
 {
   LOG4CXX_DEBUG(logger, "Entering mysql_rollback: mysql=" << mysql);
 
-  my_bool result = mysql ? getCarob(mysql)->rollback() : 0;
+  my_bool result = mysql ? getCarob(mysql)->rollback() ? 0 : 1 : 1;
 
   LOG4CXX_DEBUG(logger, "Leaving mysql_rollback: result=" << (bool) result);
   return result;  

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