Merge branch '0.2.x'

brianmario · brianmario · commit 1373d9735408 · 2011-06-16T00:49:52.000-07:00
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -329,7 +329,6 @@ static VALUE disconnect_and_raise(VALUE self, VALUE error) {
 
   return Qnil;
 }
-#endif
 
 static VALUE do_query(void *args) {
   struct async_query_args *async_args;
@@ -383,6 +382,7 @@ static VALUE do_query(void *args) {
 
   return Qnil;
 }
+#endif
 
 static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   struct async_query_args async_args;

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,6 @@ static VALUE disconnect_and_raise(VALUE self, VALUE error) {`
`329`	`329`
`330`	`330`	`return Qnil;`
`331`	`331`	`}`
`332`		`-#endif`
`333`	`332`
`334`	`333`	`static VALUE do_query(void *args) {`
`335`	`334`	`struct async_query_args *async_args;`
`@@ -383,6 +382,7 @@ static VALUE do_query(void *args) {`
`383`	`382`
`384`	`383`	`return Qnil;`
`385`	`384`	`}`
	`385`	`+#endif`
`386`	`386`
`387`	`387`	`static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {`
`388`	`388`	`struct async_query_args async_args;`