fixup merge

sodabrew · sodabrew · commit 1eea3e2f8e23 · 2015-06-11T15:08:35.000-07:00
diff --git a/ext/mysql2/result.c b/ext/mysql2/result.c
@@ -542,9 +542,6 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, MYSQL_FIELD * fields, const r
     wrapper->fields = rb_ary_new2(wrapper->numberOfFields);
   }
 
-  /* get the MySQL field types to convert to Ruby field types */
-  fields = mysql_fetch_fields(wrapper->result);
-
   for (i = 0; i < wrapper->numberOfFields; i++) {
     VALUE field = rb_mysql_result_fetch_field(self, i, args->symbolizeKeys);
     if (row[i]) {

Original file line number	Diff line number	Diff line change
`@@ -542,9 +542,6 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, MYSQL_FIELD * fields, const r`
`542`	`542`	`wrapper->fields = rb_ary_new2(wrapper->numberOfFields);`
`543`	`543`	`}`
`544`	`544`
`545`		`- /* get the MySQL field types to convert to Ruby field types */`
`546`		`- fields = mysql_fetch_fields(wrapper->result);`
`547`		`-`
`548`	`545`	`for (i = 0; i < wrapper->numberOfFields; i++) {`
`549`	`546`	`VALUE field = rb_mysql_result_fetch_field(self, i, args->symbolizeKeys);`
`550`	`547`	`if (row[i]) {`