Date: Friday, January 26, 2007 @ 06:31:47
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: include/CarobMySQL.hpp (1.42 -> 1.43) src/CarobMySQL.cpp (1.98
-> 1.99) src/MySQLAPI.cpp (1.65 -> 1.66)
- Set eof() to true when there is an empty result set.
- Removed dead code.
------------------------+
include/CarobMySQL.hpp | 6 ------
src/CarobMySQL.cpp | 8 --------
src/MySQLAPI.cpp | 3 +++
3 files changed, 3 insertions(+), 14 deletions(-)
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.42
libmysequoia/include/CarobMySQL.hpp:1.43
--- libmysequoia/include/CarobMySQL.hpp:1.42 Wed Dec 20 16:26:04 2006
+++ libmysequoia/include/CarobMySQL.hpp Fri Jan 26 06:31:47 2007
@@ -159,12 +159,6 @@
*/
static void free_results (MYSQL_RES * res);
- /**
- * Return true if there are no more rows to fetch from the result set or
- * there is no result set
- */
- bool eof ();
-
/**
* Set the autocommit mode. If autocommit is on then all SQL statements
will
* be executed and commited as individual transactions.
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.98
libmysequoia/src/CarobMySQL.cpp:1.99
--- libmysequoia/src/CarobMySQL.cpp:1.98 Thu Jan 25 14:16:43 2007
+++ libmysequoia/src/CarobMySQL.cpp Fri Jan 26 06:31:47 2007
@@ -721,14 +721,6 @@
}
bool
-CarobMYSQL::eof ()
-{
- LOG4CXX_DEBUG(logger, "Entering eof.");
- LOG4CXX_DEBUG(logger, "Leaving eof.");
- return 0;
-}
-
-bool
CarobMYSQL::set_autocommit (const my_bool mode)
{
LOG4CXX_DEBUG(logger, "Entering set_autocommit: mode=" << (bool) mode);
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.65 libmysequoia/src/MySQLAPI.cpp:1.66
--- libmysequoia/src/MySQLAPI.cpp:1.65 Fri Jan 19 11:34:35 2007
+++ libmysequoia/src/MySQLAPI.cpp Fri Jan 26 06:31:47 2007
@@ -779,6 +779,9 @@
my_ulonglong result = res ? res->row_count : 0;
+ if (res && (result == 0))
+ res->eof = 1;
+
LOG4CXX_DEBUG(logger, "Leaving mysql_num_rows: result=" << result);
return result;
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
