Mercurial > dovecot > core-2.2

changeset 12816:f95b1e26f1f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pgsql: Don't assert-crash if query fails when trying to send it.
author Timo Sirainen <tss@iki.fi>
date Fri, 04 Mar 2011 19:51:06 +0200
parents 27ee65dc87c2
children e758f10f40c1
files src/lib-sql/driver-pgsql.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-sql/driver-pgsql.c	Fri Mar 04 19:33:52 2011 +0200
+++ b/src/lib-sql/driver-pgsql.c	Fri Mar 04 19:51:06 2011 +0200
@@ -450,6 +450,7 @@
 	i_assert(db->cur_result == NULL);
 	i_assert(db->io == NULL);
 
+	driver_pgsql_set_state(db, SQL_DB_STATE_BUSY);
 	db->cur_result = result;
 	result->to = timeout_add(SQL_QUERY_TIMEOUT_SECS * 1000,
 				 query_timeout, result);
@@ -461,7 +462,6 @@
 		return;
 	}
 
-	driver_pgsql_set_state(db, SQL_DB_STATE_BUSY);
 	if (ret > 0) {
 		/* write blocks */
 		db->io = io_add(PQsocket(db->pg), IO_WRITE,