From: Enlightenment S. <no-...@en...> - 2012-01-31 18:07:44
|
Log: fix error checking on queue progression, also only return mysql errors that are actually errors Author: discomfitor Date: 2012-01-31 10:07:38 -0800 (Tue, 31 Jan 2012) New Revision: 67650 Trac: http://trac.enlightenment.org/e/changeset/67650 Modified: trunk/PROTO/esskyuehl/src/lib/esql_events.c trunk/PROTO/esskyuehl/src/modules/mysql/esql_mysql_backend.c Modified: trunk/PROTO/esskyuehl/src/lib/esql_events.c =================================================================== --- trunk/PROTO/esskyuehl/src/lib/esql_events.c 2012-01-31 17:56:19 UTC (rev 67649) +++ trunk/PROTO/esskyuehl/src/lib/esql_events.c 2012-01-31 18:07:38 UTC (rev 67650) @@ -81,6 +81,13 @@ INFO("Pool member %u: next call: query", e->pool_id); else INFO("Next call: query"); + e->error = e->backend.error_get(e); + if (e->error) + { + ERR("%s", e->error); + esql_event_error(e); + return; + } } esql_connect_handler(e, e->fdh); /* have to call again to start next call */ } Modified: trunk/PROTO/esskyuehl/src/modules/mysql/esql_mysql_backend.c =================================================================== --- trunk/PROTO/esskyuehl/src/modules/mysql/esql_mysql_backend.c 2012-01-31 17:56:19 UTC (rev 67649) +++ trunk/PROTO/esskyuehl/src/modules/mysql/esql_mysql_backend.c 2012-01-31 18:07:38 UTC (rev 67650) @@ -187,6 +187,14 @@ static const char * esql_mysac_error_get(Esql *e) { + switch (mysac_errno(e->backend.db)) + { + case MYERR_WANT_READ: + case MYERR_WANT_WRITE: + return NULL; + default: + break; + } return mysac_advance_error(e->backend.db); } |