[Carob-commits] CVS update of libmysequoia (3 files)

[zsolt]

    Date: Sunday, December 18, 2005 @ 20:10:38
  Author: zsolt
    Path: /cvsroot/carob/libmysequoia

Modified: include/Utils.hpp (1.8 -> 1.9) src/MySQLAPI.cpp (1.17 -> 1.18)
          src/Utils.cpp (1.8 -> 1.9)

Moved function isCarobObject to Utils.cpp


-------------------+
 include/Utils.hpp |    5 +++++
 src/MySQLAPI.cpp  |   13 ++-----------
 src/Utils.cpp     |    6 ++++++
 3 files changed, 13 insertions(+), 11 deletions(-)


Index: libmysequoia/include/Utils.hpp
diff -u libmysequoia/include/Utils.hpp:1.8 libmysequoia/include/Utils.hpp:1.9
--- libmysequoia/include/Utils.hpp:1.8  Tue Dec 13 14:09:45 2005
+++ libmysequoia/include/Utils.hpp      Sun Dec 18 20:10:38 2005
@@ -101,4 +101,9 @@
  */
 enum enum_field_types sql_to_mysql_type(const int sqltype);
 
+/**
+ * Return true if p is containing our Carob object
+ */
+bool isCarobObject(MYSQL *p);
+
 #endif /* _UTILS_HPP */
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.17 libmysequoia/src/MySQLAPI.cpp:1.18
--- libmysequoia/src/MySQLAPI.cpp:1.17  Fri Dec 16 11:55:45 2005
+++ libmysequoia/src/MySQLAPI.cpp       Sun Dec 18 20:10:38 2005
@@ -43,15 +43,6 @@
 static bool library_initialized = false;
 
 /**
- * Return true if p is containing our Carob object
- */
-static
-bool isCarobObject(MYSQL *p)
-{
-  return (p != 0) && (p->extra_info == MYSEQUOIA_MAGIC);
-}
-
-/**
  * The pointer to the CarobMySQL object is stored
  * in the thd member of the MYSQL structure.
  * This function returns a pointer to the CarobMYSQL
@@ -327,8 +318,8 @@
 mysql_free_result (MYSQL_RES * res)
 {
   LOG4CXX_DEBUG(logger, "Entering mysql_free_result.");
-  if (res && res->handle)
-    getCarob(res->handle)->free_results(res);
+  if (res)
+    CarobMYSQL::free_results(res);
   LOG4CXX_DEBUG(logger, "Leaving mysql_free_result.");
 }
 
Index: libmysequoia/src/Utils.cpp
diff -u libmysequoia/src/Utils.cpp:1.8 libmysequoia/src/Utils.cpp:1.9
--- libmysequoia/src/Utils.cpp:1.8      Thu Dec 15 10:49:14 2005
+++ libmysequoia/src/Utils.cpp  Sun Dec 18 20:10:38 2005
@@ -24,6 +24,7 @@
 #include <TypeConstants.hpp>
 
 #include <Utils.hpp>
+#include <CarobMySQL.hpp>
 
 /* MySQL include */
 #include <errmsg.h>
@@ -224,3 +225,8 @@
       return MYSQL_TYPE_NULL;
   }
 }
+
+bool isCarobObject(MYSQL *p)
+{
+  return (p != 0) && (p->extra_info == MYSEQUOIA_MAGIC);
+}

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