X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdbi.c;h=899c802c4eb1fbd8d64b8c3b8073faa853f1c28b;hb=d67f84e24b2520b5b1ccbbf1ff9d1f397e075417;hp=fe9bc516dd89de91d84d73ca7bb2352a07f0fd0a;hpb=a9191cc20f0a5af022ae1d9482af2eaf0098a46a;p=collectd.git

diff --git a/src/dbi.c b/src/dbi.c
index fe9bc516..899c802c 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -603,15 +603,16 @@ static int cdbi_read_database_query(cdbi_database_t *db, /* {{{ */
     } /* }}} */
 
     /* Get the next row from the database. */
+    if (!dbi_result_has_next_row(res))
+      break;
+
     status = dbi_result_next_row(res); /* {{{ */
     if (status != 1) {
-      if (dbi_conn_error(db->connection, NULL) != 0) {
-        char errbuf[1024];
-        WARNING("dbi plugin: cdbi_read_database_query (%s, %s): "
-                "dbi_result_next_row failed: %s.",
-                db->name, udb_query_get_name(q),
-                cdbi_strerror(db->connection, errbuf, sizeof(errbuf)));
-      }
+      char errbuf[1024];
+      WARNING("dbi plugin: cdbi_read_database_query (%s, %s): "
+              "dbi_result_next_row failed: %s.",
+              db->name, udb_query_get_name(q),
+              cdbi_strerror(db->connection, errbuf, sizeof(errbuf)));
       break;
     } /* }}} */
   }   /* }}} while (42) */