attempt to avoid race condition with active connections

brianmario · brianmario · commit 0197f21461c9 · 2011-11-15T16:08:10.000-08:00
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -312,6 +312,7 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
 
   if (result == NULL) {
     if (mysql_errno(wrapper->client) != 0) {
+      MARK_CONN_INACTIVE(self);
       rb_raise_mysql2_error(wrapper);
     }
     // no data and no error, so query was not a SELECT

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ static VALUE rb_mysql_client_async_result(VALUE self) {`
`312`	`312`
`313`	`313`	`if (result == NULL) {`
`314`	`314`	`if (mysql_errno(wrapper->client) != 0) {`
	`315`	`+ MARK_CONN_INACTIVE(self);`
`315`	`316`	`rb_raise_mysql2_error(wrapper);`
`316`	`317`	`}`
`317`	`318`	`// no data and no error, so query was not a SELECT`