Merge lp:~brianaker/libdrizzle/cleanup-api into lp:libdrizzle

[Brian Aker]

[lp:~brianaker/libdrizzle/cleanup-api]

98. By Drizzle Continuous Integration on 2013-01-27

Merge lp:~brianaker/libdrizzle/cleanup-api Build: jenkins-Libdrizzle-54

=== modified file 'configure.ac'
--- configure.ac	2013-01-18 13:33:00 +0000
+++ configure.ac	2013-01-27 00:45:27 +0000
@@ -88,6 +88,7 @@
 
 # Checks for library functions.
 AC_CHECK_FUNCS([fcntl])
+AC_CHECK_FUNCS([on_exit])
 AC_CHECK_FUNCS([poll])
 AC_CHECK_FUNCS([ppoll])
 

=== modified file 'docs/api/statement.rst'
--- docs/api/statement.rst	2013-01-05 11:25:32 +0000
+++ docs/api/statement.rst	2013-01-27 00:45:27 +0000
@@ -311,5 +311,7 @@
 
    Gets the row count for a statement buffered with :c:func:`drizzle_stmt_buffer`
 
+   On error it returns UINT64_MAX;
+
    :param stmt: The prepared statement object
    :returns: The row count

=== removed file 'libdrizzle-5.1/command_client.h'
--- libdrizzle-5.1/command_client.h	2012-12-18 11:36:28 +0000
+++ libdrizzle-5.1/command_client.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Drizzle Client & Protocol Library
- *
- * Copyright (C) 2008 Eric Day ([e-mail])
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- *     * The names of its contributors may not be used to endorse or
- * promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/**
- * @file
- * @brief Command Declarations for Clients
- */
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup drizzle_command_client Command Declarations for Clients
- * @ingroup drizzle_client_interface
- *
- * These functions are used to issue commands on a connection. Normal SQL
- * queries are issued using the drizzle_query* functions defined in query.h.
- * @{
- */
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif

=== modified file 'libdrizzle-5.1/conn.h'
--- libdrizzle-5.1/conn.h	2013-01-26 23:09:08 +0000
+++ libdrizzle-5.1/conn.h	2013-01-27 00:45:27 +0000
@@ -197,17 +197,6 @@
 in_port_t drizzle_port(const drizzle_st *con);
 
 /**
- * Set unix domain socket for a connection.
- *
- * @param[in] con Connection structure previously initialized with
- *  drizzle_create(), drizzle_clone(), or related functions.
- * @param[in] uds Unix domain socket to use for this connection, NULL for
- *  defailt value.
- */
-DRIZZLE_API
-void drizzle_set_uds(drizzle_st *con, const char *uds);
-
-/**
  * Get username for a connection.
  *
  * @param[in] con Connection structure previously initialized with

=== modified file 'libdrizzle-5.1/drizzle_client.h'
--- libdrizzle-5.1/drizzle_client.h	2013-01-26 23:09:08 +0000
+++ libdrizzle-5.1/drizzle_client.h	2013-01-27 00:45:27 +0000
@@ -56,7 +56,6 @@
 #include <libdrizzle-5.1/drizzle.h>
 #include <libdrizzle-5.1/conn_client.h>
 #include <libdrizzle-5.1/handshake_client.h>
-#include <libdrizzle-5.1/command_client.h>
 #include <libdrizzle-5.1/query.h>
 #include <libdrizzle-5.1/result_client.h>
 #include <libdrizzle-5.1/column_client.h>

=== modified file 'libdrizzle-5.1/include.am'
--- libdrizzle-5.1/include.am	2012-12-30 02:23:50 +0000
+++ libdrizzle-5.1/include.am	2013-01-27 00:45:27 +0000
@@ -5,7 +5,6 @@
 nobase_include_HEADERS+= libdrizzle-5.1/binlog.h
 nobase_include_HEADERS+= libdrizzle-5.1/column.h
 nobase_include_HEADERS+= libdrizzle-5.1/column_client.h
-nobase_include_HEADERS+= libdrizzle-5.1/command_client.h
 nobase_include_HEADERS+= libdrizzle-5.1/conn.h
 nobase_include_HEADERS+= libdrizzle-5.1/conn_client.h
 nobase_include_HEADERS+= libdrizzle-5.1/constants.h

=== modified file 'libdrizzle-5.1/return.h'
--- libdrizzle-5.1/return.h	2013-01-05 11:25:32 +0000
+++ libdrizzle-5.1/return.h	2013-01-27 00:45:27 +0000
@@ -80,3 +80,23 @@
 #ifndef __cplusplus
 typedef enum drizzle_return_t drizzle_return_t;
 #endif
+
+static inline bool drizzle_success(drizzle_return_t ret)
+{
+  if (ret == DRIZZLE_RETURN_OK)
+  {
+    return true;
+  }
+
+  return false;
+}
+
+static inline bool drizzle_failed(drizzle_return_t ret)
+{
+  if (ret != DRIZZLE_RETURN_OK)
+  {
+    return true;
+  }
+
+  return false;
+}

=== modified file 'libdrizzle/conn_local.h'
--- libdrizzle/conn_local.h	2012-12-30 11:18:18 +0000
+++ libdrizzle/conn_local.h	2013-01-27 00:45:27 +0000
@@ -118,6 +118,17 @@
  * @param[in] db Database to use with this connection.
  */
 void drizzle_set_db(drizzle_st *con, const char *db);
+
+/**
+ * Set unix domain socket for a connection.
+ *
+ * @param[in] con Connection structure previously initialized with
+ *  drizzle_create(), drizzle_clone(), or related functions.
+ * @param[in] uds Unix domain socket to use for this connection, NULL for
+ *  defailt value.
+ */
+DRIZZLE_API
+void drizzle_set_uds(drizzle_st *con, const char *uds);
  
 /**
  * Check if state stack is empty.

=== modified file 'libdrizzle/drizzle.cc'
--- libdrizzle/drizzle.cc	2013-01-26 23:31:43 +0000
+++ libdrizzle/drizzle.cc	2013-01-27 00:45:27 +0000
@@ -178,6 +178,39 @@
   return con;
 }
 
+drizzle_st *drizzle_clone(drizzle_st *drizzle, const drizzle_st *from)
+{
+  drizzle= drizzle_create();
+  if (drizzle == NULL)
+  {
+    return NULL;
+  }
+
+  drizzle->capabilities= from->capabilities;
+  drizzle->options= from->options;
+
+  drizzle->backlog= from->backlog;
+  strcpy(drizzle->db, from->db);
+  strcpy(drizzle->password, from->password);
+  strcpy(drizzle->user, from->user);
+
+  switch (from->socket_type)
+  {
+  case DRIZZLE_CON_SOCKET_TCP:
+    drizzle_set_tcp(drizzle, from->socket.tcp.host, from->socket.tcp.port);
+    break;
+
+  case DRIZZLE_CON_SOCKET_UDS:
+    drizzle_set_uds(drizzle, from->socket.uds.path_buffer);
+    break;
+
+  default:
+    break;
+  }
+
+  return drizzle;
+}
+
 void drizzle_free(drizzle_st *con)
 {
   if (con == NULL)

=== modified file 'libdrizzle/drizzle_local.h'
--- libdrizzle/drizzle_local.h	2013-01-05 11:31:45 +0000
+++ libdrizzle/drizzle_local.h	2013-01-27 00:45:27 +0000
@@ -82,6 +82,7 @@
  */
 void drizzle_free(drizzle_st *con);
 
+drizzle_st *drizzle_clone(drizzle_st *drizzle, const drizzle_st *from);
 
 /**
  * Log a message.

=== modified file 'libdrizzle/statement.cc'
--- libdrizzle/statement.cc	2013-01-26 23:09:08 +0000
+++ libdrizzle/statement.cc	2013-01-27 00:45:27 +0000
@@ -620,10 +620,10 @@
 
 uint64_t drizzle_stmt_row_count(drizzle_stmt_st *stmt)
 {
-  if ((stmt == NULL) || (stmt->execute_result == NULL))
+  if (stmt and stmt->execute_result)
   {
-    return 0;
+    return stmt->execute_result->row_count;
   }
 
-  return stmt->execute_result->row_count;
+  return UINT64_MAX;
 }

=== modified file 'rpm/spec.in'
--- rpm/spec.in	2013-01-18 13:33:00 +0000
+++ rpm/spec.in	2013-01-27 00:45:27 +0000
@@ -62,7 +62,6 @@
 %{_includedir}/libdrizzle-5.1/binlog.h
 %{_includedir}/libdrizzle-5.1/column.h
 %{_includedir}/libdrizzle-5.1/column_client.h
-%{_includedir}/libdrizzle-5.1/command_client.h
 %{_includedir}/libdrizzle-5.1/conn.h
 %{_includedir}/libdrizzle-5.1/conn_client.h
 %{_includedir}/libdrizzle-5.1/constants.h

=== renamed file 'tests/unit/binlog.c' => 'tests/unit/binlog.cc'
--- tests/unit/binlog.c	2013-01-13 22:31:54 +0000
+++ tests/unit/binlog.cc	2013-01-27 00:45:27 +0000
@@ -2,7 +2,7 @@
  *
  *  Drizzle Client & Protocol Library
  *
- * Copyright (C) 2012 Drizzle Developer Group
+ * Copyright (C) 2012-2013 Drizzle Developer Group
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,36 +35,32 @@
  *
  */
 
+
 #include <yatl/lite.h>
 
 #include <libdrizzle-5.1/libdrizzle.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
+
+#include "tests/unit/cleanup.h"
+
+#include <cstdio>
+#include <cstdlib>
 
 int main(int argc, char *argv[])
 {
   (void) argc;
   (void) argv;
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
+                          getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                          getenv("MYSQL_USER"),
+                          getenv("MYSQL_PASSWORD"),
+                          getenv("MYSQL_SCHEMA"), NULL);
 
+  CLOSE_ON_EXIT(con);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
 
   drizzle_return_t ret= drizzle_connect(con);
-  if (ret == DRIZZLE_RETURN_COULD_NOT_CONNECT)
-  {
-    char error[DRIZZLE_MAX_ERROR_SIZE];
-    strncpy(error, drizzle_error(con), DRIZZLE_MAX_ERROR_SIZE);
-
-    drizzle_quit(con);
-    SKIP_IF_(ret == DRIZZLE_RETURN_COULD_NOT_CONNECT, "%s(%s)", error, drizzle_strerror(ret));
-  }
+  SKIP_IF_(ret == DRIZZLE_RETURN_COULD_NOT_CONNECT, "%s(%s)", drizzle_error(con), drizzle_strerror(ret));
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s(%s)", drizzle_error(con), drizzle_strerror(ret));
 
   drizzle_result_st *result= drizzle_start_binlog(con, 0, "", 0, true, &ret);
@@ -86,15 +82,12 @@
      * timestamps will have weird values that shoud fail this after several
      * events.  Also rotate event doesn't have a timestamp so need to add 0
      * to this test */
-    ASSERT_FALSE_(((timestamp < 1325376000) && (timestamp != 0)), "Bad timestamp retrieved: %" PRIu32, timestamp);
+    ASSERT_FALSE_(((timestamp < 1325376000) && (timestamp != 0)), "Bad timestamp retrieved: %u", timestamp);
 
     /* An event higher than the max known is bad, either we don't know about
      * new events or type is corrupted */
     ASSERT_FALSE_((drizzle_binlog_event_type(result) >= DRIZZLE_EVENT_TYPE_END), "Bad event type: %d", drizzle_binlog_event_type(result));
   }
 
-  ret= drizzle_quit(con);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));
-
   return EXIT_SUCCESS;
 }

=== added file 'tests/unit/cleanup.h'
--- tests/unit/cleanup.h	1970-01-01 00:00:00 +0000
+++ tests/unit/cleanup.h	2013-01-27 00:45:27 +0000
@@ -0,0 +1,58 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab: 
+ *
+ *  Drizzle Client & Protocol Library
+ *
+ * Copyright (C) 2013 Drizzle Developer Group
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ *     * The names of its contributors may not be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#pragma once
+
+#ifdef  __cplusplus
+# include <cstdlib>
+# include <cstdio>
+#else
+# include <stdlib.h>
+# include <stdio.h>
+#endif
+
+#include <libdrizzle-5.1/libdrizzle.h>
+
+static drizzle_st *con= NULL;
+static void close_connection_on_exit(void)
+{
+  drizzle_return_t ret= drizzle_quit(con);
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "drizzle_quit() : %s", strerror(ret));
+}
+
+#define CLOSE_ON_EXIT(__connection) atexit(close_connection_on_exit);
+

=== modified file 'tests/unit/column.c'
--- tests/unit/column.c	2013-01-12 13:40:18 +0000
+++ tests/unit/column.c	2013-01-27 00:45:27 +0000
@@ -36,8 +36,10 @@
  */
 
 #include <yatl/lite.h>
+#include "tests/unit/cleanup.h"
 
 #include <libdrizzle-5.1/libdrizzle.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -49,22 +51,16 @@
   drizzle_row_t row;
   int num_fields;
 
-  drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                      getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                      getenv("MYSQL_USER"),
-                                      getenv("MYSQL_PASSWORD"),
-                                      getenv("MYSQL_SCHEMA"), 0);
+  con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
+                          getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                          getenv("MYSQL_USER"),
+                          getenv("MYSQL_PASSWORD"),
+                          getenv("MYSQL_SCHEMA"), 0);
   ASSERT_NOT_NULL_(con, "Drizzle connection object creation error");
+  CLOSE_ON_EXIT(con);
 
   drizzle_return_t ret= drizzle_connect(con);
-  if (ret == DRIZZLE_RETURN_COULD_NOT_CONNECT)
-  {
-    char error[DRIZZLE_MAX_ERROR_SIZE];
-    strncpy(error, drizzle_error(con), DRIZZLE_MAX_ERROR_SIZE);
-
-    drizzle_quit(con);
-    SKIP_IF_(ret == DRIZZLE_RETURN_COULD_NOT_CONNECT, "%s(%s)", error, drizzle_strerror(ret));
-  }
+  SKIP_IF_(ret == DRIZZLE_RETURN_COULD_NOT_CONNECT, "%s", drizzle_strerror(ret));
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s(%s)", drizzle_error(con), strerror(ret));
 
   drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
@@ -123,8 +119,5 @@
   drizzle_query(con, "DROP SCHEMA IF EXISTS libdrizzle", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP SCHEMA libdrizzle (%s)", drizzle_error(con));
 
-  ret= drizzle_quit(con);
-  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_strerror(ret));
-
   return EXIT_SUCCESS;
 }

=== modified file 'tests/unit/include.am'
--- tests/unit/include.am	2013-01-12 10:51:40 +0000
+++ tests/unit/include.am	2013-01-27 00:45:27 +0000
@@ -2,11 +2,22 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-tests_unit_binlog_SOURCES= tests/unit/binlog.c
+noinst_HEADERS+= tests/unit/cleanup.h
+
+tests_unit_binlog_SOURCES= tests/unit/binlog.cc
 tests_unit_binlog_LDADD= libdrizzle/libdrizzle.la
 check_PROGRAMS+= tests/unit/binlog
 noinst_PROGRAMS+= tests/unit/binlog
 
+gdb-binlog: tests/unit/binlog
+	@$(GDB_COMMAND) tests/unit/binlog
+
+valgrind-binlog: tests/unit/binlog
+	@$(VALGRIND_COMMAND) tests/unit/binlog
+
+check-binlog: tests/unit/binlog
+	tests/unit/binlog
+
 tests_unit_escape_SOURCES= tests/unit/escape.c
 tests_unit_escape_LDADD= libdrizzle/libdrizzle.la
 check_PROGRAMS+= tests/unit/escape
@@ -27,6 +38,16 @@
 check_PROGRAMS+= tests/unit/column
 noinst_PROGRAMS+= tests/unit/column
 
+gdb-column: tests/unit/column
+	@$(GDB_COMMAND) tests/unit/column
+
+valgrind-column: tests/unit/column
+	@$(VALGRIND_COMMAND) tests/unit/column
+
+check-column: tests/unit/column
+	tests/unit/column
+
+
 tests_unit_row_SOURCES= tests/unit/row.c
 tests_unit_row_LDADD= libdrizzle/libdrizzle.la
 check_PROGRAMS+= tests/unit/row
@@ -47,6 +68,15 @@
 check_PROGRAMS+= tests/unit/connect
 noinst_PROGRAMS+= tests/unit/connect
 
+gdb-connect: tests/unit/connect
+	@$(GDB_COMMAND) tests/unit/connect
+
+valgrind-connect: tests/unit/connect
+	@$(VALGRIND_COMMAND) tests/unit/connect
+
+check-connect: tests/unit/connect
+	tests/unit/connect
+
 tests_unit_connect_uds_SOURCES= tests/unit/connect_uds.c
 tests_unit_connect_uds_LDADD= libdrizzle/libdrizzle.la
 check_PROGRAMS+= tests/unit/connect_uds

=== modified file 'tests/unit/statement.c'
--- tests/unit/statement.c	2013-01-12 13:40:18 +0000
+++ tests/unit/statement.c	2013-01-27 00:45:27 +0000
@@ -49,7 +49,9 @@
 {
   (void) argc;
   (void) argv;
-  drizzle_stmt_st *stmt;
+  drizzle_stmt_st *stmt= NULL;
+
+  ASSERT_EQ(UINT64_MAX, drizzle_stmt_row_count(stmt));
 
   drizzle_st *con= drizzle_create_tcp(getenv("MYSQL_SERVER"),
                                       getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
@@ -92,30 +94,18 @@
 
   uint32_t val= 1;
   ret = drizzle_stmt_set_int(stmt, 0, val, false);
-  if (ret != DRIZZLE_RETURN_OK)
-  {
-    printf("Bind failure\n");
-    return EXIT_FAILURE;
-  }
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
   ret = drizzle_stmt_execute(stmt);
-  if (ret != DRIZZLE_RETURN_OK)
-  {
-    printf("Execute failure\n");
-    return EXIT_FAILURE;
-  }
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
+
   ret = drizzle_stmt_buffer(stmt);
-  if (ret != DRIZZLE_RETURN_OK)
-  {
-    printf("Buffer failure\n");
-    return EXIT_FAILURE;
-  }
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
+
   /* Result should have 2 rows */
-  if (drizzle_stmt_row_count(stmt) != 2)
-  {
-    printf("Retrieved bad row count\n");
-    return EXIT_FAILURE;
-  }
+  int count= drizzle_stmt_row_count(stmt);
+  ASSERT_EQ_(2, count, "%s", drizzle_error(con));
+
   uint32_t i= 1;
   while (drizzle_stmt_fetch(stmt) != DRIZZLE_RETURN_ROW_END)
   {
@@ -154,11 +144,7 @@
     return EXIT_FAILURE;
   }
   ret = drizzle_stmt_close(stmt);
-  if (ret != DRIZZLE_RETURN_OK)
-  {
-    printf("Statement close failure ret: %d, err: %d, msg: %s\n", ret, drizzle_errno(con), drizzle_error(con));
-    return EXIT_FAILURE;
-  }
+  ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "%s", drizzle_error(con));
 
   drizzle_query(con, "DROP TABLE libdrizzle.t1", 0, &ret);
   ASSERT_EQ_(DRIZZLE_RETURN_OK, ret, "DROP TABLE libdrizzle.t1");

=== modified file 'yatl/include.am'
--- yatl/include.am	2012-12-29 10:49:09 +0000
+++ yatl/include.am	2013-01-27 00:45:27 +0000
@@ -2,5 +2,43 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+LIBTOOL_COMMAND= ${abs_top_builddir}/libtool --mode=execute
+VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
+VALGRIND_COMMAND= TESTS_ENVIRONMENT="valgrind" $(VALGRIND_EXEC_COMMAND)
+HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 --read-var-info=yes
+DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd
+MASSIF_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=massif
+GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x yatl/run.gdb
+PTRCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1
+PAHOLE_COMMAND= $(LIBTOOL_COMMAND) --mode=execute pahole
+VALGRIND_SUPRESSION= $(LIBTOOL_COMMAND) valgrind --leak-check=full --show-reachable=yes --error-limit=no --gen-suppressions=all --log-file=minimalraw.log
+
+export LIBTOOL_COMMAND
+export VALGRIND_COMMAND
+export HELGRIND_COMMAND
+export DRD_COMMAND
+export GDB_COMMAND 
+  
+valgrind:
+	@echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_EXEC_COMMAND)\""
+
+valgrind-supressions:
+	@echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_SUPRESSION)\""
+
+gdb:
+	@echo make check TESTS_ENVIRONMENT="\"$(GDB_COMMAND)\""
+
+helgrind:
+	@echo make check TESTS_ENVIRONMENT="\"$(HELGRIND_COMMAND)\""
+
+drd:
+	@echo make check TESTS_ENVIRONMENT="\"$(DRD_COMMAND)\""
+
 noinst_HEADERS+= yatl/lite.h
 
+EXTRA_DIST+= yatl/run.gdb
+
+.PHONY: clean-yatl-check
+	clean-yatl-check:
+	-rm -rf tmp_chroot
+

=== added file 'yatl/run-ci.gdb'
--- yatl/run-ci.gdb	1970-01-01 00:00:00 +0000
+++ yatl/run-ci.gdb	2013-01-27 00:45:27 +0000
@@ -0,0 +1,6 @@
+set logging on
+set logging overwrite on
+set environment LIBTEST_IN_GDB=1
+run
+thread apply all bt
+quit

=== added file 'yatl/run.gdb'
--- yatl/run.gdb	1970-01-01 00:00:00 +0000
+++ yatl/run.gdb	2013-01-27 00:45:27 +0000
@@ -0,0 +1,5 @@
+set logging on
+set logging overwrite on
+set environment LIBTEST_IN_GDB=1
+run
+thread apply all bt