Merge trunk

silvakid · silvakid · commit 7d460192913a · 2015-05-14T16:44:32.000+01:00
diff --git a/driver/mysql_ps_resultset.cpp b/driver/mysql_ps_resultset.cpp
@@ -253,7 +253,6 @@ void
 MySQL_Prepared_ResultSet::closeIntern()
 {
 	CPP_ENTER("MySQL_Prepared_ResultSet::closeIntern");
-	proxy->stmt_free_result();
 	is_valid = false;
 }
 /* }}} */
diff --git a/test/unit/bugs/bugs.cpp b/test/unit/bugs/bugs.cpp
@@ -935,8 +935,6 @@ void bugs::bug21067193()
   logMsg("bugs::bug21067193");
   try
   {
-    int x = std::numeric_limits<int>::max();
-    int y = std::numeric_limits<int>::min();
 
 
     stmt->execute("DROP TABLE IF EXISTS bug21067193");
diff --git a/test/unit/bugs/bugs.h b/test/unit/bugs/bugs.h
@@ -65,6 +65,7 @@ class bugs : public unit_fixture
     TEST_CASE(bug17218692);
     TEST_CASE(bug21053335);
     TEST_CASE(bug21067193);
+    TEST_CASE(bug21066575);
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,6 @@ void`
`253`	`253`	`MySQL_Prepared_ResultSet::closeIntern()`
`254`	`254`	`{`
`255`	`255`	`CPP_ENTER("MySQL_Prepared_ResultSet::closeIntern");`
`256`		`- proxy->stmt_free_result();`
`257`	`256`	`is_valid = false;`
`258`	`257`	`}`
`259`	`258`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -935,8 +935,6 @@ void bugs::bug21067193()`
`935`	`935`	`logMsg("bugs::bug21067193");`
`936`	`936`	`try`
`937`	`937`	`{`
`938`		`- int x = std::numeric_limits<int>::max();`
`939`		`- int y = std::numeric_limits<int>::min();`
`940`	`938`
`941`	`939`
`942`	`940`	`stmt->execute("DROP TABLE IF EXISTS bug21067193");`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ class bugs : public unit_fixture`
`65`	`65`	`TEST_CASE(bug17218692);`
`66`	`66`	`TEST_CASE(bug21053335);`
`67`	`67`	`TEST_CASE(bug21067193);`
	`68`	`+ TEST_CASE(bug21066575);`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`/**`