[GNUnet-SVN] r37538 - gnunet/src/psycstore

[gnunet]

Author: christophe.genevey
Date: 2016-07-13 16:53:34 +0200 (Wed, 13 Jul 2016)
New Revision: 37538

Modified:
   gnunet/src/psycstore/plugin_psycstore_mysql.c
Log:
start to fix PSYCstore mysql

Modified: gnunet/src/psycstore/plugin_psycstore_mysql.c
===================================================================
--- gnunet/src/psycstore/plugin_psycstore_mysql.c       2016-07-13 10:02:09 UTC 
(rev 37537)
+++ gnunet/src/psycstore/plugin_psycstore_mysql.c       2016-07-13 14:53:34 UTC 
(rev 37538)
@@ -56,7 +56,7 @@
  * a failure of the command 'cmd' on file 'filename'
  * with the message given by strerror(errno).
  */
-#define LOG_MYSQL(db, level, cmd, stmt) do { GNUNET_log_from (level, 
"psycstore-mysql", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, 
__LINE__, mysql_stmt_error (stmt)); } while(0)
+#define LOG_MYSQL(db, level, cmd, stmt) do { GNUNET_log_from (level, 
"psycstore-mysql", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, 
__LINE__, mysql_stmt_error (GNUNET_MYSQL_statement_get_stmt(stmt))); } while(0)
 
 #define LOG(kind,...) GNUNET_log_from (kind, "psycstore-mysql", __VA_ARGS__)
 
@@ -655,16 +655,6 @@
 exec_channel (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt,
               const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key)
 {
-  MYSQL_STMT * statement = NULL;
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
-  if (NULL == statement)
-  {
-     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql statement invalide", statement);
-    return GNUNET_SYSERR;
-  }
-
   struct GNUNET_MY_QueryParam params[] = {
     GNUNET_MY_query_param_auto_from_type (channel_key),
     GNUNET_MY_query_param_end
@@ -675,13 +665,13 @@
                                           params))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql exec_channel", statement);
+                "mysql exec_channel", stmt);
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -696,17 +686,7 @@
 transaction_begin (struct Plugin *plugin, enum Transactions transaction)
 {
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_begin;
-  MYSQL_STMT * statement = NULL;
-
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
-  if (NULL == statement)
-  {
-     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql statement invalide", statement);
-    return GNUNET_SYSERR;
-  }
-
+ 
   struct GNUNET_MY_QueryParam params[] = {
     GNUNET_MY_query_param_end
   };
@@ -716,14 +696,14 @@
                                             params))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql extract_result", statement);
+                "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt(stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -739,17 +719,7 @@
 transaction_commit (struct Plugin *plugin)
 {
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_commit;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
-  if (NULL == statement)
-  {
-    LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql statement invalide", statement);
-    return GNUNET_SYSERR;
-  }
-
   struct GNUNET_MY_QueryParam params[] = {
     GNUNET_MY_query_param_end
   };
@@ -759,14 +729,14 @@
                                             params))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql extract_result", statement);
+                "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -782,16 +752,7 @@
 transaction_rollback (struct Plugin *plugin)
 {
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_rollback;
-  MYSQL_STMT* statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-  if (NULL == statement)
-  {
-    LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql statement invalide", statement);
-    return GNUNET_SYSERR;
-  }
-
   struct GNUNET_MY_QueryParam params[] = {
     GNUNET_MY_query_param_end
   };
@@ -801,14 +762,14 @@
                                             params))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql extract_result", statement);
+                "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -823,16 +784,6 @@
 {
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_channel_key;
 
-  MYSQL_STMT *statement = NULL;
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
-  if(NULL == statement)
-  {
-   LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql statement invalide", statement);
-    return GNUNET_SYSERR;
-  }
-
   struct GNUNET_MY_QueryParam params[] = {
     GNUNET_MY_query_param_auto_from_type (channel_key),
     GNUNET_MY_query_param_end
@@ -843,14 +794,14 @@
                                             params))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql extract_result", statement);
+                "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -864,16 +815,6 @@
 {
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_slave_key;
 
-  MYSQL_STMT *statement = NULL;
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
-  if(NULL == statement)
-  {
-   LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql statement invalide", statement);
-    return GNUNET_SYSERR;
-  }
-
   struct GNUNET_MY_QueryParam params[] = {
     GNUNET_MY_query_param_auto_from_type (slave_key),
     GNUNET_MY_query_param_end
@@ -884,14 +825,14 @@
                                             params))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql extract_result", statement);
+                "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -924,11 +865,7 @@
   uint64_t igroup_generation = (uint64_t)group_generation;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_membership;
-  MYSQL_STMT *statement = NULL;
 
-/**** FAIL HERE ****/
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   GNUNET_assert (TRANSACTION_NONE == plugin->transaction);
 
   if (announced_at > INT64_MAX ||
@@ -958,14 +895,14 @@
                                             params))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql extract_result", statement);
+                "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
   return GNUNET_OK;
@@ -988,19 +925,9 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_membership;
-  MYSQL_STMT *statement = NULL;
 
   uint32_t did_join = 0;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
-  if(NULL == statement)
-  {
-   LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql statement invalide", statement);
-    return GNUNET_SYSERR;
-  }
-
   int ret = GNUNET_SYSERR;
 
   struct GNUNET_MY_QueryParam params_select[] = {
@@ -1015,7 +942,7 @@
                               params_select))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql execute prepared", statement);
+                "mysql execute prepared", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1028,7 +955,7 @@
                                 results_select))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                "mysql extract_result", statement);
+                "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1041,10 +968,10 @@
     ret = GNUNET_NO;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1067,10 +994,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_fragment;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   GNUNET_assert (TRANSACTION_NONE == plugin->transaction);
 
   uint64_t fragment_id = GNUNET_ntohll (msg->fragment_id);
@@ -1112,14 +1036,14 @@
                               params_insert))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql execute prepared", statement);
+              "mysql execute prepared", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1142,10 +1066,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->update_message_flags;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   int ret = GNUNET_SYSERR;
 
   struct GNUNET_MY_QueryParam params_update[] = {
@@ -1160,14 +1081,14 @@
                                             params_update))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql execute prepared", statement);
+              "mysql execute prepared", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1244,10 +1165,6 @@
   int ret = GNUNET_SYSERR;
   int sql_ret;
 
-  MYSQL_STMT *statement = NULL;
-
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   uint32_t hop_counter = 0;
   void *signature = NULL;
   void *purpose = NULL;
@@ -1297,7 +1214,7 @@
         break;
       default:
         LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                    "mysql extract_result", statement);
+                    "mysql extract_result", stmt);
     }
   }
   while (sql_ret == GNUNET_YES);
@@ -1324,16 +1241,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_fragments;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-  if (NULL == statement)
-  {
-   LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql get_stmt", statement);
-    return GNUNET_SYSERR;
-  }
-
   int ret = GNUNET_SYSERR;
   *returned_fragments = 0;
 
@@ -1346,10 +1254,10 @@
 
   ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, 
cb_cls);
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1375,10 +1283,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_fragments;
-  MYSQL_STMT * statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   int ret = GNUNET_SYSERR;
   *returned_fragments = 0;
 
@@ -1390,10 +1295,10 @@
 
   ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, 
cb_cls);
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1421,10 +1326,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_messages;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   int ret = GNUNET_SYSERR;
   *returned_fragments = 0;
 
@@ -1438,10 +1340,10 @@
 
   ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, 
cb_cls);
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1467,10 +1369,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_messages;
-  MYSQL_STMT *statement;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   int ret = GNUNET_SYSERR;
   *returned_fragments = 0;
 
@@ -1483,10 +1382,10 @@
 
   ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, 
cb_cls);
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1513,10 +1412,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_message_fragment;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   int ret = GNUNET_SYSERR;
 
   struct GNUNET_MY_QueryParam params_select[] = {
@@ -1531,16 +1427,16 @@
                                             params_select))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql execute prepared", statement);
+              "mysql execute prepared", stmt);
     return GNUNET_SYSERR;
   }
-/****** CHANGER ICI ****/
+
   ret = fragment_row (stmt, cb, cb_cls);
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1564,16 +1460,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_message;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-  if (NULL == statement)
-  {
-    LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql get statement", statement);
-    return GNUNET_SYSERR;
-  }
-
   int ret = GNUNET_SYSERR;
 
   struct GNUNET_MY_QueryParam params_select[] = {
@@ -1586,7 +1473,7 @@
                                             params_select))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql execute prepared", statement);
+              "mysql execute prepared", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1603,14 +1490,14 @@
   if (GNUNET_OK != ret)
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql extract_result", statement);
+              "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1632,16 +1519,7 @@
   struct Plugin *plugin = cls;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_state;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-  if (NULL == statement)
-  {
-    LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql get_stmt", statement);
-    return GNUNET_SYSERR;
-  }
-
   int ret = GNUNET_SYSERR;
 
   struct GNUNET_MY_QueryParam params_select[] = {
@@ -1654,7 +1532,7 @@
                                             params_select))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql execute prepared", statement);
+              "mysql execute prepared", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1669,14 +1547,14 @@
   if (GNUNET_OK != ret)
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql extract_result", statement);
+              "mysql extract_result", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1696,16 +1574,6 @@
 {
   int ret = GNUNET_SYSERR;
 
-  MYSQL_STMT *statement = NULL;
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
-  if (NULL == statement)
-  {
-    LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql get_stmt", statement);
-    return GNUNET_SYSERR;
-  }
-
   struct GNUNET_MY_QueryParam params[] = {
     GNUNET_MY_query_param_auto_from_type (channel_key),
     GNUNET_MY_query_param_string (name),
@@ -1720,14 +1588,14 @@
   if (GNUNET_OK != ret)
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql execute prepared", statement);
+              "mysql execute prepared", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1740,16 +1608,6 @@
                    const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key,
                    uint64_t message_id)
 {
-  MYSQL_STMT *statement = NULL;
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
-  if (NULL == statement)
-  {
-    LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql get_stmt", statement);
-    return GNUNET_SYSERR;
-  }
-
   struct GNUNET_MY_QueryParam params[] = {
     GNUNET_MY_query_param_uint64 (&message_id),
     GNUNET_MY_query_param_auto_from_type (channel_key),
@@ -1761,14 +1619,14 @@
                                             params))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql execute prepared", statement);
+              "mysql execute prepared", stmt);
     return GNUNET_SYSERR;
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -1985,10 +1843,7 @@
   int sql_ret ;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_one;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-
   struct GNUNET_MY_QueryParam params_select[] = {
     GNUNET_MY_query_param_auto_from_type (channel_key),
     GNUNET_MY_query_param_string (name),
@@ -2022,13 +1877,13 @@
       break;
     default:
       LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql extract_result", statement);
+              "mysql extract_result", stmt);
   }
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -2052,16 +1907,7 @@
   int ret = GNUNET_SYSERR;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_prefix;
-  MYSQL_STMT *statement = NULL;
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
 
-  if (NULL == statement)
-  {
-    LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql get_stmt", statement);
-    return GNUNET_SYSERR;
-  }
-
   uint32_t name_len = (uint32_t) strlen (name);
 
   struct GNUNET_MY_QueryParam params_select[] = {
@@ -2107,15 +1953,15 @@
         break;
       default:
         LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql extract_result", statement);
+              "mysql extract_result", stmt);
     }
   }
   while (sql_ret == GNUNET_YES);
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }
 
@@ -2139,16 +1985,7 @@
   int ret = GNUNET_SYSERR;
 
   struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_signed;
-  MYSQL_STMT *statement = NULL;
 
-  statement = GNUNET_MYSQL_statement_get_stmt (stmt);
-  if (NULL == statement)
-  {
-    LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql get_stmt", statement);
-    return GNUNET_SYSERR;
-  }
-
   struct GNUNET_MY_QueryParam params_select[] = {
     GNUNET_MY_query_param_auto_from_type (channel_key),
     GNUNET_MY_query_param_end
@@ -2190,15 +2027,15 @@
         break;
       default:
          LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql extract_result", statement);
+              "mysql extract_result", stmt);
     }
   }
   while (sql_ret == GNUNET_YES);
 
-  if (0 != mysql_stmt_reset (statement))
+  if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt)))
   {
     LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-              "mysql_stmt_reset", statement);
+              "mysql_stmt_reset", stmt);
     return GNUNET_SYSERR;
   }