Date: Tuesday, January 31, 2006 @ 13:14:45
Author: zsolt
Path: /cvsroot/carob/libmysequoia
Modified: include/Utils.hpp (1.17 -> 1.18) src/CarobMySQL.cpp (1.39 ->
1.40) src/CarobStmt.cpp (1.18 -> 1.19) src/MySQLAPI.cpp (1.36 ->
1.37)
Refactoring error_messages to client_errors because php5/mysqli needs direct
access to it.
--------------------+
include/Utils.hpp | 2 --
src/CarobMySQL.cpp | 2 +-
src/CarobStmt.cpp | 2 +-
src/MySQLAPI.cpp | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
Index: libmysequoia/include/Utils.hpp
diff -u libmysequoia/include/Utils.hpp:1.17 libmysequoia/include/Utils.hpp:1.18
--- libmysequoia/include/Utils.hpp:1.17 Thu Jan 19 17:01:54 2006
+++ libmysequoia/include/Utils.hpp Tue Jan 31 13:14:45 2006
@@ -33,8 +33,6 @@
const int SQLT_OK = 0;
const int SQLT_UNKNOWN = 1;
-extern const char *error_messages[];
-
typedef char *PCHAR;
#define FREE_AND_NULL(p) {delete (p); (p)=0;}
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.39
libmysequoia/src/CarobMySQL.cpp:1.40
--- libmysequoia/src/CarobMySQL.cpp:1.39 Mon Jan 30 13:45:56 2006
+++ libmysequoia/src/CarobMySQL.cpp Tue Jan 31 13:14:45 2006
@@ -709,7 +709,7 @@
CarobMYSQL::set_error(int errcode, int sqlstate)
{
LOG4CXX_DEBUG(logger, "Entering set_error.");
- set_error(errcode, error_messages[errcode-CR_MIN_ERROR],
error_sqlstate[sqlstate]);
+ set_error(errcode, client_errors[errcode-CR_MIN_ERROR],
error_sqlstate[sqlstate]);
LOG4CXX_DEBUG(logger, "Leaving set_error.");
}
Index: libmysequoia/src/CarobStmt.cpp
diff -u libmysequoia/src/CarobStmt.cpp:1.18 libmysequoia/src/CarobStmt.cpp:1.19
--- libmysequoia/src/CarobStmt.cpp:1.18 Mon Jan 30 13:45:56 2006
+++ libmysequoia/src/CarobStmt.cpp Tue Jan 31 13:14:45 2006
@@ -854,7 +854,7 @@
CarobStmt::set_error(int errcode, int sqlstate)
{
LOG4CXX_DEBUG(logger, "Entering set_error.");
- set_error(errcode, error_messages[errcode-CR_MIN_ERROR],
error_sqlstate[sqlstate]);
+ set_error(errcode, client_errors[errcode-CR_MIN_ERROR],
error_sqlstate[sqlstate]);
LOG4CXX_DEBUG(logger, "Leaving set_error.");
}
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.36 libmysequoia/src/MySQLAPI.cpp:1.37
--- libmysequoia/src/MySQLAPI.cpp:1.36 Tue Jan 31 11:15:46 2006
+++ libmysequoia/src/MySQLAPI.cpp Tue Jan 31 13:14:45 2006
@@ -753,7 +753,7 @@
{
LOG4CXX_DEBUG(logger, "Entering mysql_error: mysql=" << mysql);
- const char *result = mysql ? mysql->net.last_error :
error_messages[CR_NULL_POINTER-CR_MIN_ERROR];
+ const char *result = mysql ? mysql->net.last_error :
client_errors[CR_NULL_POINTER-CR_MIN_ERROR];
LOG4CXX_DEBUG(logger, "Leaving mysql_error: result=" << result);
return result;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
