BUG#19894987: HANDLE_FATAL_SIGNAL (SIG=11) IN HA_INDEX_OR_RND_END | SQL/HANDLER.H:1999

jhauglid · jhauglid · commit 7532dbffe1e0 · 2015-01-28T16:35:09.000+01:00
Post-push fix: Fix ASAN warnings.
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
@@ -1736,10 +1736,12 @@ bool close_temporary_tables(THD *thd)
   mysql_ha_rm_temporary_tables(thd);
   if (!mysql_bin_log.is_open())
   {
-    for (TABLE *t= thd->temporary_tables; t; t= t->next)
+    TABLE *tmp_next;
+    for (TABLE *t= thd->temporary_tables; t; t= tmp_next)
     {
-        mysql_lock_remove(thd, thd->lock, t);
-        close_temporary(t, 1, 1);
+      tmp_next= t->next;
+      mysql_lock_remove(thd, thd->lock, t);
+      close_temporary(t, 1, 1);
     }
 
     thd->temporary_tables= 0;

Original file line number	Diff line number	Diff line change
`@@ -1736,10 +1736,12 @@ bool close_temporary_tables(THD *thd)`
`1736`	`1736`	`mysql_ha_rm_temporary_tables(thd);`
`1737`	`1737`	`if (!mysql_bin_log.is_open())`
`1738`	`1738`	`{`
`1739`		`- for (TABLE *t= thd->temporary_tables; t; t= t->next)`
	`1739`	`+ TABLE *tmp_next;`
	`1740`	`+ for (TABLE *t= thd->temporary_tables; t; t= tmp_next)`
`1740`	`1741`	`{`
`1741`		`- mysql_lock_remove(thd, thd->lock, t);`
`1742`		`- close_temporary(t, 1, 1);`
	`1742`	`+ tmp_next= t->next;`
	`1743`	`+ mysql_lock_remove(thd, thd->lock, t);`
	`1744`	`+ close_temporary(t, 1, 1);`
`1743`	`1745`	`}`
`1744`	`1746`
`1745`	`1747`	`thd->temporary_tables= 0;`