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

[csaba]

    Date: Monday, January 23, 2006 @ 12:28:41
  Author: csaba
    Path: /cvsroot/carob/libmysequoia/src

Modified: MySQLAPI.cpp (1.29 -> 1.30)

Added more logging on function entry/exit.


--------------+
 MySQLAPI.cpp |  605 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 325 insertions(+), 280 deletions(-)


Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.29 libmysequoia/src/MySQLAPI.cpp:1.30
--- libmysequoia/src/MySQLAPI.cpp:1.29  Thu Jan 19 15:37:21 2006
+++ libmysequoia/src/MySQLAPI.cpp       Mon Jan 23 12:28:41 2006
@@ -84,7 +84,8 @@
   if (!library_initialized)
     mysql_server_init(0, 0, 0);
 
-  LOG4CXX_DEBUG(logger, "Entering mysql_init.");
+  // we can start logging only after the library was initialized
+  LOG4CXX_DEBUG(logger, "Entering mysql_init: mysql=" << mysql);
 
   try
   {
@@ -102,12 +103,14 @@
   }
   catch (...)
   {
+    LOG4CXX_DEBUG(logger, "Creation of the Carob object failed.");
+
     if (free_in_close)
       delete mysql;
     mysql = 0;
   }
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_init.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_init: mysql=" << mysql);
   return mysql;
 }
 
@@ -115,7 +118,7 @@
 void STDCALL
 mysql_close (MYSQL * mysql)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_close.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_close: mysql=" << mysql);
 
   if (mysql)
     delete getCarob(mysql);
@@ -129,17 +132,17 @@
 int STDCALL
 mysql_server_init (int argc, char **argv, char **groups)
 {
+  // initialize logging 
   PropertyConfigurator::configure(LOGGER_CONFIG_FILE);
 
   LOG4CXX_DEBUG(logger, "Entering mysql_server_init.");
+  
+  tzset();
 
   // TODO make it thread safe
   library_initialized = true;
-  
-  tzset();
 
   LOG4CXX_DEBUG(logger, "Leaving mysql_server_init.");
-  
   return 0;
 }
 
@@ -158,10 +161,10 @@
 mysql_connect (MYSQL * mysql, const char *host, const char *user,
          const char *passwd)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_connect: mysql=" << mysql << " host=" 
<< host << " user=" << user << " passwd=" << passwd);
+  
   MYSQL *result;
 
-  LOG4CXX_DEBUG(logger, "Entering mysql_connect.");
-  
   if (mysql)
   {
     result = getCarob(mysql)->connect(host, user, passwd, 0, 0, 0, 0) ? mysql 
: 0;
@@ -169,8 +172,7 @@
   else
     result = 0;
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_connect.");
-    
+  LOG4CXX_DEBUG(logger, "Leaving mysql_connect: result=" << result);
   return result;
 }
 
@@ -187,14 +189,14 @@
         const char *passwd, const char *db, unsigned int port,
         const char *unix_socket, unsigned long clientflag)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_real_connect: : mysql=" << mysql << " 
host=" << host << " user=" << user << " passwd=" << passwd << " db=" << db << " 
port=" << port);
+
   MYSQL *result;
   
   // TODO make it thread safe
   if (!library_initialized)
     mysql_server_init(0, 0, 0);
 
-  LOG4CXX_DEBUG(logger, "Entering mysql_real_connect.");
-
   if (mysql)
   {
     result = getCarob(mysql)->connect(host, user, passwd, db, port, 
unix_socket, clientflag) ? mysql : 0;
@@ -202,8 +204,7 @@
   else
     result = 0;
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_real_connect.");
-
+  LOG4CXX_DEBUG(logger, "Leaving mysql_real_connect: result=" << result);
   return result;
 }
 
@@ -211,10 +212,10 @@
 int STDCALL
 mysql_select_db (MYSQL * mysql, const char *db)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_select_db: mysql=" << mysql << " db=" 
<< db);
+
   int result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_select_db.");
-
   if (mysql)
   {
     result = getCarob(mysql)->select_db(db) ? 0 : 1;
@@ -222,8 +223,7 @@
   else
     result = 1;
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_select_db.");
-    
+  LOG4CXX_DEBUG(logger, "Leaving mysql_select_db: result=" << result);
   return result;
 }
 
@@ -232,10 +232,10 @@
 mysql_change_user (MYSQL * mysql, const char *user, const char *passwd,
        const char *db)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_change_user: mysql=" << mysql << " 
user=" << user << " passwd=" << passwd << " db=" << db);
+
   my_bool result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_change_user.");
-  
   if (mysql)
   {
     result = getCarob(mysql)->change_user(user, passwd, db);
@@ -243,8 +243,7 @@
   else
     result = 0;
   
-  LOG4CXX_DEBUG(logger, "Leaving mysql_change_user.");
-  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_change_user: result=" << (bool) 
!result);
   return !result;
 }
 
@@ -252,18 +251,16 @@
 int STDCALL
 mysql_options (MYSQL * mysql, enum mysql_option option, const char *arg)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_options.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_options: mysql=" << mysql);
   LOG4CXX_DEBUG(logger, "Leaving mysql_options.");
-  
   return 0;
 }
 
 int STDCALL
 mysql_ping (MYSQL * mysql)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_ping.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_ping: mysql=" << mysql);
   LOG4CXX_DEBUG(logger, "Leaving mysql_ping.");
-  
   return 0;
 }
 
@@ -273,12 +270,11 @@
 int STDCALL
 mysql_query (MYSQL * mysql, const char *q)
 {
-  int result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_query.");
-  result = mysql_real_query(mysql, q, strlen(q));
-  LOG4CXX_DEBUG(logger, "Leaving mysql_query.");
-  
+  LOG4CXX_DEBUG(logger, "Entering mysql_query: mysql=" << mysql << " query=" 
<< q);
+
+  int result = mysql_real_query(mysql, q, strlen(q));
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_query: result=" << result);
   return result;  
 }
 
@@ -286,15 +282,16 @@
 int STDCALL
 mysql_real_query (MYSQL * mysql, const char *q, unsigned long length)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_real_query: mysql=" << mysql << " 
query=" << q << " length=" << length);
+
   int result;
 
-  LOG4CXX_DEBUG(logger, "Entering mysql_real_query.");
   if (mysql)
     result = getCarob(mysql)->real_query(q, length) ? 0 : 1;
   else    
     result = 1;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_real_query.");
-    
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_real_query: result=" << result);
   return result;
 }
 
@@ -302,15 +299,16 @@
 MYSQL_RES *STDCALL
 mysql_use_result (MYSQL * mysql)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_use_result: mysql=" << mysql);
+
   MYSQL_RES *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_use_result.");
+
   if (mysql)
     result = getCarob(mysql)->get_results(false);
   else
     result = 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_use_result.");
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_use_result: result=" << result);
   return result;    
 }
 
@@ -318,15 +316,16 @@
 MYSQL_RES *STDCALL
 mysql_store_result (MYSQL * mysql)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_store_result: mysql=" << mysql);
+
   MYSQL_RES *result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_store_result.");
   if (mysql)
     result = getCarob(mysql)->get_results(true);
   else
     result = 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_store_result.");
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_store_result: result=" << result);
   return result;    
 }
 
@@ -334,9 +333,11 @@
 void STDCALL
 mysql_free_result (MYSQL_RES * res)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_free_result.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_free_result: res=" << res);
+
   if (res)
     CarobMYSQL::free_results(res);
+
   LOG4CXX_DEBUG(logger, "Leaving mysql_free_result.");
 }
 
@@ -344,9 +345,10 @@
 MYSQL_ROW STDCALL
 mysql_fetch_row (MYSQL_RES * res)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_row: res" << res);
+
   MYSQL_ROW result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_row.");
   if (res)
   {
     if (res->data)
@@ -368,54 +370,56 @@
   }
   else
     result = 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_row.");
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_row: result=" << result);
   return result;
 }
 
 my_bool STDCALL
 mysql_eof (MYSQL_RES * res)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_eof.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_eof.");
-  
-  return 0;
+  LOG4CXX_DEBUG(logger, "Entering mysql_eof: res=" << res);
+
+  my_bool result = res->eof;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_eof: result=" << (bool) result);
+  return result;
 }
 
 my_bool STDCALL
 mysql_more_results (MYSQL * mysql)
 {
-  my_bool result;
-  LOG4CXX_DEBUG(logger, "Entering mysql_more_results.");
-  result = mysql ? getCarob(mysql)->more_results() : false;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_more_results.");
-  
+  LOG4CXX_DEBUG(logger, "Entering mysql_more_results: mysql" << mysql);
+
+  my_bool result = mysql ? getCarob(mysql)->more_results() : false;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_more_results: result=" << (bool) 
result);
   return result;
 }
 
 int STDCALL
 mysql_next_result (MYSQL * mysql)
 {
-  int result;
-  LOG4CXX_DEBUG(logger, "Entering mysql_next_result.");
-  result = mysql ? getCarob(mysql)->next_result() : -1;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_next_result.");
-  
+  LOG4CXX_DEBUG(logger, "Entering mysql_next_result: mysql=" << mysql);
+
+  int result = mysql ? getCarob(mysql)->next_result() : -1;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_next_result: result=" << result);
   return result;
 }
 
 /* Seeks to an arbitrary row number in a query result set. */
 void STDCALL
-mysql_data_seek (MYSQL_RES * result, my_ulonglong offset)
+mysql_data_seek (MYSQL_RES * res, my_ulonglong offset)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_data_seek.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_data_seek: res=" << res << " offset=" 
<< offset);
   
-  if (result && result->data)
+  if (res && res->data)
   {
     MYSQL_ROWS *curRow;
-    for (curRow=result->data->data; offset && curRow; offset--, curRow = 
curRow->next) ;
-    result->current_row = 0;
-    result->data_cursor = curRow;
+    for (curRow=res->data->data; offset && curRow; offset--, curRow = 
curRow->next) ;
+    res->current_row = 0;
+    res->data_cursor = curRow;
   }
 
   LOG4CXX_DEBUG(logger, "Leaving mysql_data_seek.");
@@ -425,9 +429,10 @@
 MYSQL_ROW_OFFSET STDCALL
 mysql_row_seek (MYSQL_RES * res, MYSQL_ROW_OFFSET offset)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_row_seek: res=" << res << " offset=" 
<< offset);
+
   MYSQL_ROW_OFFSET result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_row_seek.");
   if (res && res->data)
   {
     result = res->data_cursor;
@@ -436,8 +441,8 @@
   }    
   else
     result = 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_row_seek.");
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_row_seek: result=" << result);
   return result;
 }
 
@@ -445,11 +450,11 @@
 MYSQL_ROW_OFFSET STDCALL
 mysql_row_tell (MYSQL_RES * res)
 {
-  MYSQL_ROW_OFFSET result;
-  LOG4CXX_DEBUG(logger, "Entering mysql_row_tell.");
-  result = res ? res->data_cursor : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_row_tell.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_row_tell: res=" << res);
+
+  MYSQL_ROW_OFFSET result = res ? res->data_cursor : 0;
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_row_tell: result=" << result);
   return result;  
 }
 
@@ -457,15 +462,16 @@
 MYSQL_FIELD *STDCALL
 mysql_fetch_field (MYSQL_RES * res)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_field: res=" << res);
+
   MYSQL_FIELD *result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_field.");
   if (res && (res->current_field < res->field_count))
     result = &res->fields[res->current_field++];
   else
     result = 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_field.");
-    
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_field: result=" << result);
   return result;
 }
 
@@ -473,15 +479,16 @@
 MYSQL_FIELD *STDCALL
 mysql_fetch_field_direct (MYSQL_RES * res, unsigned int fieldnr)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_field_direct: res=" << res << " 
fieldnr=" << fieldnr);
+
   MYSQL_FIELD *result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_field_direct.");
   if (res && (fieldnr < res->field_count))
     result = &res->fields[fieldnr];
   else
     result = 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_field_direct.");
-  
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_field_direct: result=" << result);
   return result;
 }
 
@@ -489,12 +496,11 @@
 MYSQL_FIELD *STDCALL
 mysql_fetch_fields (MYSQL_RES * res)
 {
-  MYSQL_FIELD *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_fields.");
-  result = res ? res->fields : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_fields.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_fields: res=" << res);
+
+  MYSQL_FIELD *result = res ? res->fields : 0;
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_fields: result=" << result);
   return result;  
 }
 
@@ -502,9 +508,10 @@
 unsigned long *STDCALL
 mysql_fetch_lengths (MYSQL_RES * res)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_lengths: res" << res);
+
   unsigned long *result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_fetch_lengths.");
   if (res && res->current_row)
   {
     //Calculate the field length from pointer offsets
@@ -534,8 +541,8 @@
   }
   else
     result = 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_lengths.");
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_fetch_lengths: result=" << result);
   return result;
 }
 
@@ -543,9 +550,10 @@
 MYSQL_FIELD_OFFSET STDCALL
 mysql_field_seek (MYSQL_RES * res, MYSQL_FIELD_OFFSET offset)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_field_seek: res=" << res << " offset=" 
<< offset);
+
   MYSQL_FIELD_OFFSET result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_field_seek.");
   if (res)
   {
     result = res->current_field;
@@ -553,8 +561,8 @@
   }
   else
     result = 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_field_seek.");
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_field_seek: result=" << result);
   return result;
 }
 
@@ -562,12 +570,11 @@
 unsigned int STDCALL
 mysql_field_count (MYSQL * mysql)
 {
-  unsigned int result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_field_count.");
-  result = mysql ? mysql->field_count : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_field_count.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_field_count: mysql=" << mysql);
 
+  unsigned int result = mysql ? mysql->field_count : 0;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_field_count: result=" << result);
   return result;
 }
 
@@ -575,12 +582,11 @@
 MYSQL_FIELD_OFFSET STDCALL
 mysql_field_tell (MYSQL_RES * res)
 {
-  MYSQL_FIELD_OFFSET result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_field_tell.");
-  result = res ? res->current_field : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_field_tell.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_field_tell: res=" << res);
 
+  MYSQL_FIELD_OFFSET result = res ? res->current_field : 0;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_field_tell: result=" << result);
   return result;
 }
 
@@ -588,12 +594,11 @@
 unsigned int STDCALL
 mysql_num_fields (MYSQL_RES * res)
 {
-  unsigned int result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_num_fields.");
-  result = res ? res->field_count : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_num_fields.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_num_fields: res=" << res);
 
+  unsigned int result = res ? res->field_count : 0;
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_num_fields: result=" << result);
   return result;
 }
 
@@ -601,12 +606,11 @@
 my_ulonglong
 mysql_affected_rows (MYSQL * mysql)
 {
-  my_ulonglong result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_affected_rows.");
-  result = mysql ? mysql->affected_rows : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_affected_rows.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_affected_rows: mysql=" << mysql);
+
+  my_ulonglong result = mysql ? mysql->affected_rows : 0;
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_affected_rows: result=" << result);
   return result;
 }
 
@@ -614,22 +618,24 @@
 my_ulonglong STDCALL
 mysql_num_rows (MYSQL_RES * res)
 {
-  my_ulonglong result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_num_rows.");
-  result = res ? res->row_count : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_num_rows.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_num_rows: res=" << res);
 
+  my_ulonglong result = res ? res->row_count : 0;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_num_rows: result=" << result);
   return result;
 }
 
 my_ulonglong STDCALL
 mysql_insert_id (MYSQL * mysql)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_insert_id.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_insert_id.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_insert_id: mysql=" << mysql);
   
-  return 0;
+  //TODO implementation
+  int result = 0;
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_insert_id: result=" << result);
+  return result;
 }
 
 /* Error handling */
@@ -638,12 +644,11 @@
 unsigned int STDCALL
 mysql_errno (MYSQL * mysql)
 {
-  unsigned int result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_errno.");
-  result = mysql ? mysql->net.last_errno : CR_NULL_POINTER;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_errno.");
-  
+  LOG4CXX_DEBUG(logger, "Entering mysql_errno: mysql=" << mysql);
+
+  unsigned int result = mysql ? mysql->net.last_errno : CR_NULL_POINTER;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_errno: result=" << result);
   return result;
 }
 
@@ -651,12 +656,11 @@
 const char *STDCALL
 mysql_error (MYSQL * mysql)
 {
-  const char *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_error.");
-  result = mysql ? mysql->net.last_error : 
error_messages[CR_NULL_POINTER-CR_MIN_ERROR];
-  LOG4CXX_DEBUG(logger, "Leaving mysql_error.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_error: mysql=" << mysql);
+
+  const char *result = mysql ? mysql->net.last_error : 
error_messages[CR_NULL_POINTER-CR_MIN_ERROR];
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_error: result=" << result);
   return result;
 }
 
@@ -664,28 +668,33 @@
 const char *STDCALL
 mysql_sqlstate (MYSQL * mysql)
 {
-  const char *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_sqlstate.");
-  result = mysql ? mysql->net.sqlstate : error_sqlstate[SQLT_UNKNOWN];
-  LOG4CXX_DEBUG(logger, "Leaving mysql_sqlstate.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_sqlstate: mysql=" << mysql);
 
+  const char *result = mysql ? mysql->net.sqlstate : 
error_sqlstate[SQLT_UNKNOWN];
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_sqlstate: result=" << result);
   return result;
 }
 
 unsigned int STDCALL
 mysql_warning_count (MYSQL * mysql)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_warning_count.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_warning_count.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_warning_count: mysql=" << mysql);
+
+  // TODO implementation
+  unsigned int result = 0;
   
-  return 0;
+  LOG4CXX_DEBUG(logger, "Leaving mysql_warning_count: result=" << result);
+  return result;
 }
 
 void STDCALL
 mysql_debug (const char *debug)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_debug.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_debug: debug=" << debug);
+  
+  // TODO implementation
+  
   LOG4CXX_DEBUG(logger, "Leaving mysql_debug.");
 }
 
@@ -694,29 +703,38 @@
 unsigned long STDCALL
 mysql_escape_string (char *to, const char *from, unsigned long from_length)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_escape_string.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_escape_string.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_escape_string: to=" << to << " from=" 
<< from << "from_length=" << from_length);
+
+  // TODO implementation
+  unsigned long result = 0;
   
-  return 0;
+  LOG4CXX_DEBUG(logger, "Leaving mysql_escape_string: result=" << result);
+  return result;
 }
 
 unsigned long STDCALL
 mysql_real_escape_string (MYSQL * mysql, char *to, const char *from,
         unsigned long length)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_real_escape_string.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_real_escape_string.");
-  
-  return 0;
+  LOG4CXX_DEBUG(logger, "Entering mysql_real_escape_string: mysql=" << mysql 
<< " to=" << to << " from=" << from << "length=" << length);
+
+  // TODO implementation
+  unsigned long result = 0;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_real_escape_string: result=" << result);
+  return result;
 }
 
 const char *
 mysql_character_set_name (MYSQL * mysql)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_character_set_name.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_character_set_name.");
-  
-  return 0;
+  LOG4CXX_DEBUG(logger, "Entering mysql_character_set_name: mysql=" << mysql);
+
+  // TODO implementation
+  char *result = 0;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_character_set_name: result=" << result);
+  return result;
 }
 
 /* Transaction support */
@@ -725,12 +743,11 @@
 my_bool STDCALL
 mysql_autocommit (MYSQL * mysql, my_bool auto_mode)
 {
-  my_bool result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_autocommit.");
-  result = mysql ? getCarob(mysql)->set_autocommit(auto_mode) : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_autocommit.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_autocommit: mysql=" << mysql << " 
auto_mode=" << auto_mode);
+
+  my_bool result = mysql ? getCarob(mysql)->set_autocommit(auto_mode) : 0;
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_autocommit: result=" << (bool) result);
   return result;
 }
 
@@ -738,12 +755,11 @@
 my_bool STDCALL
 mysql_commit (MYSQL * mysql)
 {
-  my_bool result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_commit.");
-  result = mysql ? getCarob(mysql)->commit() : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_commit.");
-  
+  LOG4CXX_DEBUG(logger, "Entering mysql_commit: mysql=" << mysql);
+
+  my_bool result = mysql ? getCarob(mysql)->commit() : 0;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_commit: result=" << (bool) result);
   return result;
 }
 
@@ -751,12 +767,11 @@
 my_bool STDCALL
 mysql_rollback (MYSQL * mysql)
 {
-  my_bool result;
+  LOG4CXX_DEBUG(logger, "Entering mysql_rollback: mysql=" << mysql);
 
-  LOG4CXX_DEBUG(logger, "Entering mysql_rollback.");
-  result = mysql ? getCarob(mysql)->rollback() : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_rollback.");
+  my_bool result = mysql ? getCarob(mysql)->rollback() : 0;
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_rollback: result=" << (bool) result);
   return result;  
 }
 
@@ -764,48 +779,49 @@
 
 /* Creates a database. This function is deprecated; use the SQL statement 
CREATE DATABASE instead. */
 int STDCALL
-mysql_create_db (MYSQL * mysql, const char *DB)
+mysql_create_db (MYSQL * mysql, const char *db)
 {
-  int result;
-  std::string query=std::string("CREATE DATABASE ")+DB;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_create_db.");
-  result = mysql_real_query(mysql, query.data(), query.length());
-  LOG4CXX_DEBUG(logger, "Leaving mysql_create_db.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_create_db: mysql=" << mysql << " db=" 
<< db);
+
+  std::string query=std::string("CREATE DATABASE ")+db;
+  int result = mysql_real_query(mysql, query.data(), query.length());
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_create_db: result=" << result);
   return result;  
 }
 
 /* Drops a database. This function is deprecated; use the SQL statement DROP 
DATABASE instead. */
 int STDCALL
-mysql_drop_db (MYSQL * mysql, const char *DB)
+mysql_drop_db (MYSQL * mysql, const char *db)
 {
-  int result;
-  std::string query=std::string("DROP DATABASE ")+DB;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_drop_db.");
-  result = mysql_real_query(mysql, query.data(), query.length());
-  LOG4CXX_DEBUG(logger, "Leaving mysql_drop_db.");
-  
+  LOG4CXX_DEBUG(logger, "Entering mysql_drop_db: mysql=" << mysql << " db=" << 
db);
+
+  std::string query=std::string("DROP DATABASE ")+db;
+  int result = mysql_real_query(mysql, query.data(), query.length());
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_drop_db: result=" << result);
   return result;
 }
 
 int STDCALL
 mysql_shutdown (MYSQL * mysql, enum mysql_enum_shutdown_level shutdown_level)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_shutdown.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_shutdown.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_shutdown: mysql=" << mysql << " 
shutdown_level=" << shutdown_level);
+
+  // TODO implementation
+  int result = 0;
   
-  return 0;
+  LOG4CXX_DEBUG(logger, "Leaving mysql_shutdown: result=" << result);
+  return result;
 }
 
 /* Flush or reset tables and caches. */
 int STDCALL
 mysql_refresh (MYSQL * mysql, unsigned int refresh_options)
 {
-  int result = 0;
+  LOG4CXX_DEBUG(logger, "Entering mysql_refresh: mysql=" << mysql << " 
refresh_options" << refresh_options);
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_refresh.");
+  int result = 0;
   
   if (refresh_options & REFRESH_GRANT)
     result = mysql_real_query(mysql, "FLUSH PRIVILEGES", 16);
@@ -818,8 +834,7 @@
   if (!result && refresh_options & REFRESH_STATUS)
     result = mysql_real_query(mysql, "FLUSH STATUS", 12);
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_refresh.");
-    
+  LOG4CXX_DEBUG(logger, "Leaving mysql_refresh: result =" << result);
   return result;
 }
 
@@ -847,12 +862,11 @@
 const char *STDCALL
 mysql_get_host_info (MYSQL * mysql)
 {
-  const char *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_get_host_info.");
-  result = mysql ? mysql->host_info : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_get_host_info.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_get_host_info: mysql=" << mysql);
+
+  const char *result = mysql ? mysql->host_info : 0;
   
+  LOG4CXX_DEBUG(logger, "Leaving mysql_get_host_info: result=" << result);
   return result;
 }
 
@@ -860,12 +874,11 @@
 const char *
 mysql_get_server_info (MYSQL * mysql)
 {
-  const char *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_get_server_info.");
-  result = mysql ? mysql->server_version : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_get_server_info.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_get_server_info: mysql=" << mysql);
+
+  const char *result = mysql ? mysql->server_version : 0;
   
+  LOG4CXX_DEBUG(logger, "Leaving mysql_get_server_info: result=" << result);
   return result;
 }
 
@@ -873,9 +886,10 @@
 unsigned long STDCALL
 mysql_get_server_version (MYSQL * mysql)
 {
+  LOG4CXX_DEBUG(logger, "Entering mysql_get_server_version: mysql=" << mysql);
+
   unsigned long result;
   
-  LOG4CXX_DEBUG(logger, "Entering mysql_get_server_version.");
   if (mysql)
   {
     unsigned long res = 0, multiply = 10000;
@@ -887,8 +901,7 @@
   else
     result = 0;
     
-  LOG4CXX_DEBUG(logger, "Leaving mysql_get_server_version.");
-
+  LOG4CXX_DEBUG(logger, "Leaving mysql_get_server_version: result=" << result);
   return result;
 }
 
@@ -896,12 +909,11 @@
 unsigned int STDCALL
 mysql_get_proto_info (MYSQL * mysql)
 {
-  unsigned int result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_get_proto_info.");
-  result = mysql ? mysql->protocol_version : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_get_proto_info.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_get_proto_info: mysql=" << mysql);
+
+  unsigned int result = mysql ? mysql->protocol_version : 0;
   
+  LOG4CXX_DEBUG(logger, "Leaving mysql_get_proto_info: result=" << result);
   return result;
 }
 
@@ -909,12 +921,11 @@
 const char *STDCALL
 mysql_info (MYSQL * mysql)
 {
-  const char *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_info.");
-  result = mysql ? mysql->info : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_info.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_info: mysql=" << mysql);
 
+  const char *result = mysql ? mysql->info : 0;
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_info: result=" << result);
   return result;
 }
 
@@ -922,12 +933,11 @@
 MYSQL_RES *STDCALL
 mysql_list_dbs (MYSQL * mysql, const char *wild)
 {
-  MYSQL_RES *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_list_dbs.");
-  result = mysql ? getCarob(mysql)->list_databases(wild) : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_list_dbs.");
-  
+  LOG4CXX_DEBUG(logger, "Entering mysql_list_dbs: mysql=" << mysql << " wild=" 
<< wild);
+
+  MYSQL_RES *result = mysql ? getCarob(mysql)->list_databases(wild) : 0;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_list_dbs: result=" << result);
   return result;
 }
 
@@ -935,41 +945,48 @@
 MYSQL_RES *STDCALL
 mysql_list_fields (MYSQL * mysql, const char *table, const char *wild)
 {
-  MYSQL_RES *result;
-  LOG4CXX_DEBUG(logger, "Entering mysql_list_fields.");
-  result = mysql ? getCarob(mysql)->list_table_fields(table, wild) : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_list_fields.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_list_fields: mysql=" << mysql << " 
table=" << table << " wild=" << wild);
+
+  MYSQL_RES *result = mysql ? getCarob(mysql)->list_table_fields(table, wild) 
: 0;
 
+  LOG4CXX_DEBUG(logger, "Leaving mysql_list_fields: result" << result);
   return result;
 }
 
 MYSQL_RES *STDCALL
 mysql_list_processes (MYSQL * mysql)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_list_processes.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_list_processes.");
-  return 0;
+  LOG4CXX_DEBUG(logger, "Entering mysql_list_processes: mysql=" << mysql);
+  
+  // TODO implementation
+  MYSQL_RES *result = 0;
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_list_processes: result=" << result);
+  return result;
 }
 
 /* Returns table names matching a simple regular expression. */
 MYSQL_RES *STDCALL
 mysql_list_tables (MYSQL * mysql, const char *wild)
 {
-  MYSQL_RES *result;
-  
-  LOG4CXX_DEBUG(logger, "Entering mysql_list_tables.");
-  result = mysql ? getCarob(mysql)->list_tables(wild) : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_list_tables.");
-  
+  LOG4CXX_DEBUG(logger, "Entering mysql_list_tables: mysql=" << mysql << " 
wild=" << wild);
+
+  MYSQL_RES *result = mysql ? getCarob(mysql)->list_tables(wild) : 0;
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_list_tables: result=" << result);
   return result;
 }
 
 const char *STDCALL
 mysql_stat (MYSQL * mysql)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stat.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stat.");
-  return 0;
+  LOG4CXX_DEBUG(logger, "Entering mysql_stat: mysql=" << mysql);
+
+  // TODO implementation
+  const char *result = 0;
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stat: result=" << result);
+  return result;
 }
 
 /* Thread functions */
@@ -1010,7 +1027,7 @@
 MYSQL_STMT *
 mysql_stmt_init (MYSQL * mysql)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_init.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_init: mysql=" << mysql);
   
   MYSQL_STMT *result = 0;
   
@@ -1022,19 +1039,19 @@
   else
     LOG4CXX_ERROR(logger, "The given mysql pointer was not initialized with 
mysql_init.");
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_init.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_init: result=" << result);
   return result;
 }
 
 my_bool
 mysql_stmt_close (MYSQL_STMT *stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_close.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_close: stmt=" << stmt);
 
   if (isCarobObject(stmt))
     delete getCarobStmt(stmt);
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_close.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_close: result=" << 0);
   return 0;
 }
 
@@ -1042,7 +1059,7 @@
 mysql_stmt_attr_get (MYSQL_STMT * stmt, enum enum_stmt_attr_type option,
          void *arg)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_attr_get.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_attr_get: stmt=" << stmt << " 
option=" << option << " arg=" << arg);
 
   my_bool result = false;
 
@@ -1073,7 +1090,7 @@
     result = true;
   }  
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_attr_get.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_attr_get: result=" << (bool) 
result);
   return result;
 }
 
@@ -1081,7 +1098,7 @@
 mysql_stmt_attr_set (MYSQL_STMT * stmt, enum enum_stmt_attr_type option,
          const void *arg)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_attr_set.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_attr_set: stmt=" << stmt << " 
option=" << option << " arg=" << arg);
 
   my_bool result = false;
   
@@ -1125,7 +1142,7 @@
     result = true;
   }
     
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_attr_set.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_attr_set: result=" << (bool) 
result);
   return result;
 }
 
@@ -1133,7 +1150,7 @@
 mysql_stmt_prepare (MYSQL_STMT * stmt, const char *query,
         unsigned long length)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_prepare.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_prepare: stmt=" << stmt << " 
query=" << query << " length=" << length);
 
   int result = 1;
 
@@ -1145,14 +1162,14 @@
     //Todo maybe better errorhandling?
   }
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_prepare.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_prepare: result=" << result);
   return result;
 }
 
 my_bool
 mysql_stmt_bind_param (MYSQL_STMT * stmt, MYSQL_BIND * bind)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_bind_param.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_bind_param: stmt" << stmt << " 
bind=" << bind);
 
   my_bool result = false;
 
@@ -1165,14 +1182,14 @@
     result = true;
   }
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_bind_param.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_bind_param: result=" << (bool) 
result);
   return result;
 }
 
 int
 mysql_stmt_execute (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_execute.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_execute: stmt" << stmt);
 
   int result = 0;
 
@@ -1185,14 +1202,15 @@
     result = 1;
   }
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_execute.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_execute: result=" << result);
   return result;
 }
 
 my_bool
 mysql_stmt_bind_result (MYSQL_STMT * stmt, MYSQL_BIND * bind)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_bind_result.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_bind_result: stmt=" << stmt << " 
bind=" << bind);
+
   my_bool result = false;
 
   if (isCarobObject(stmt))
@@ -1204,69 +1222,74 @@
     result = true;
   }
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_bind_result.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_bind_result: result=" << (bool) 
result);
   return result;
 }
 
 unsigned int
 mysql_stmt_errno (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_errno.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_errno: stmt=" << stmt);
 
   unsigned int result = stmt ? stmt->last_errno : 0;
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_errno.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_errno: result=" << result);
   return result;
 }
 
 const char *
 mysql_stmt_error (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_error.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_error: stmt=" << stmt);
 
   const char *result = stmt ? stmt->last_error : 0;
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_error.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_error: result=" << result);
   return result;
 }
 
 const char *
 mysql_stmt_sqlstate (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_sqlstate.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_sqlstate: stmt=" << stmt);
 
   const char *result = stmt ? stmt->sqlstate : 0;
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_sqlstate.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_sqlstate: result=" << result);
   return result;
 }
 
 my_ulonglong
 mysql_stmt_affected_rows (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_affected_rows.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_affected_rows: stmt=" << stmt);
+
   my_ulonglong result = stmt ? stmt->affected_rows : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_affected_rows.");
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_affected_rows: result=" << result);
   return result;
 }
 
 void
 mysql_stmt_data_seek (MYSQL_STMT * stmt, my_ulonglong offset)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_data_seek.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_data_seek: stmt=" << stmt << " 
offset=" << offset);
+
   if (stmt && stmt->result.data)
   {
     MYSQL_ROWS *curRow;
     for (curRow=stmt->result.data; offset && curRow; offset--, curRow = 
curRow->next) ;
     stmt->data_cursor = curRow;
   }
+
   LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_data_seek.");
 }
 
 int
 mysql_stmt_fetch (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_fetch.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_fetch: stmt=" << stmt);
+
   int result = 0;
 
   if (isCarobObject(stmt))
@@ -1277,7 +1300,8 @@
     //Todo maybe better errorhandling?
     result = 1;
   }
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_fetch.");
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_fetch: result=" << result);
   return result;
 }
 
@@ -1285,7 +1309,7 @@
 mysql_stmt_fetch_column (MYSQL_STMT * stmt, MYSQL_BIND * bind,
        unsigned int column, unsigned long offset)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_fetch_column.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_fetch_column: stmt=" << stmt << " 
bind=" << bind << " column=" << column << " offset=" << offset);
 
   int result = 1;
 
@@ -1297,73 +1321,88 @@
     //Todo maybe better errorhandling?
   }
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_fetch_column.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_fetch_column: result=" << result);
   return result;
 }
 
 unsigned int
 mysql_stmt_field_count (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_field_count.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_field_count: stmt=" << stmt);
+
   unsigned result = stmt ? stmt->field_count : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_field_count.");
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_field_count: result=" << result);
   return result;
 }
 
 my_bool
 mysql_stmt_free_result (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_free_result.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_free_result: stmt=" << stmt);
+
   my_bool result = true;
 
   if (isCarobObject(stmt))
     result = CarobStmt::free_result(stmt);
   else
     LOG4CXX_ERROR(logger, "The given mysql stmt pointer was not initialized 
with mysql_stmt_init.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_free_result.");
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_free_result: result=" << (bool) 
result);
   return result;
 }
 
 my_ulonglong
 mysql_stmt_insert_id (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_insert_id.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_insert_id.");
-  return 0;
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_insert_id: stmt=" << stmt);
+  
+  // TODO implementation
+  my_ulonglong result = 0;
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_insert_id: result=" << result);
+  return result;
 }
 
 my_ulonglong
 mysql_stmt_num_rows (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_num_rows.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_num_rows: stmt=" << stmt);
   
   my_ulonglong result = stmt ? stmt->result.rows : 0;
   
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_num_rows.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_num_rows: result=" << result);
   return result;
 }
 
 unsigned long
 mysql_stmt_param_count (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_param_count.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_param_count: stmt=" << stmt);
+  
   int result = stmt ? stmt->param_count : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_param_count.");
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_param_count: result=" << result);
   return result;
 }
 
 MYSQL_RES *
 mysql_stmt_param_metadata (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_param_metadata.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_param_metadata.");
-  return 0;
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_param_metadata: stmt=" << stmt);
+  
+  // TODO implementation
+  MYSQL_RES *result = 0;
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_param_metadata: result=" << 
result);
+  return result;
 }
 
 my_bool
 mysql_stmt_reset (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_reset.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_reset: stmt=" << stmt);
+  
   my_bool result = true;
 
   if (isCarobObject(stmt))
@@ -1371,23 +1410,25 @@
   else
     LOG4CXX_ERROR(logger, "The given mysql stmt pointer was not initialized 
with mysql_stmt_init.");
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_reset.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_reset: result=" << (bool) result);
   return result;
 }
 
 MYSQL_RES *
 mysql_stmt_result_metadata (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_result_metadata.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_result_metadata: stmt=" << stmt);
+  
   MYSQL_RES *result = stmt ? getCarobStmt(stmt)->result_metadata() : 0;
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_result_metadata.");
+  
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_result_metadata: result=" << 
result);
   return result;
 }
 
 MYSQL_ROW_OFFSET
 mysql_stmt_row_seek (MYSQL_STMT * stmt, MYSQL_ROW_OFFSET offset)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_row_seek.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_row_seek: stmt=" << stmt << " 
offset=" << offset);
 
   MYSQL_ROW_OFFSET result;
 
@@ -1399,18 +1440,18 @@
   else
     result = 0;
 
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_row_seek.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_row_seek: result=" << result);
   return result;
 }
 
 MYSQL_ROW_OFFSET
 mysql_stmt_row_tell (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_row_tell.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_row_tell: stmt=" << stmt);
   
   MYSQL_ROW_OFFSET result = stmt ? stmt->data_cursor : 0;
   
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_row_tell.");
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_row_tell: result=" << result);
   return result;
 }
 
@@ -1418,21 +1459,24 @@
 mysql_stmt_send_long_data (MYSQL_STMT * stmt, unsigned int parameter_number,
          const char *data, unsigned long length)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_send_long_data.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_send_long_data: stmt=" << stmt << 
" parameter_number=" << parameter_number << " data=" << data << " length=" << 
length);
+
   my_bool result = true;
 
   if (isCarobObject(stmt))
     result = getCarobStmt(stmt)->send_long_data(parameter_number, data, 
length);
   else
     LOG4CXX_ERROR(logger, "The given mysql stmt pointer was not initialized 
with mysql_stmt_init.");
-  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_send_long_data.");
+
+  LOG4CXX_DEBUG(logger, "Leaving mysql_stmt_send_long_data: result=" << 
(bool)result);
   return result;
 }
 
 int
 mysql_stmt_store_result (MYSQL_STMT * stmt)
 {
-  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_store_result.");
+  LOG4CXX_DEBUG(logger, "Entering mysql_stmt_store_result: stmt=" << stmt);
+
   int result = 0;
 
   if (isCarobObject(stmt))
@@ -1443,6 +1487,7 @@
     //Todo maybe better errorhandling?
     result = 1;
   }
-  LOG4CXX_DEBUG(logger, "Leave mysql_stmt_store_result.");
+
+  LOG4CXX_DEBUG(logger, "Leave mysql_stmt_store_result: result=" << result);
   return result;
 }

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