[Commits] Rev 3500: Fixed LP bug #972943 properly. in file:///home/igor/maria/maria-5.3-merge/

Igor Babaev igor at askmonty.org
Sun Apr 8 03:27:00 EEST 2012


At file:///home/igor/maria/maria-5.3-merge/

------------------------------------------------------------
revno: 3500
revision-id: igor at askmonty.org-20120408002700-7o6ozsb5pw99pf80
parent: igor at askmonty.org-20120407092904-nnwqfwtt2g5ia8gr
committer: Igor Babaev <igor at askmonty.org>
branch nick: maria-5.3-merge
timestamp: Sat 2012-04-07 17:27:00 -0700
message:
  Fixed LP bug #972943 properly.
  The previous patch for the bug (that erroneously identified the bug as
  bug 972973 in its comment) was incorrect. 
  It turned out that the code that triggered the abort complain reported for
  the bug was not needed at all.
-------------- next part --------------
=== modified file 'sql/item_subselect.cc'
--- a/sql/item_subselect.cc	2012-04-07 09:29:04 +0000
+++ b/sql/item_subselect.cc	2012-04-08 00:27:00 +0000
@@ -2726,9 +2726,6 @@
 void subselect_uniquesubquery_engine::cleanup()
 {
   DBUG_ENTER("subselect_uniquesubquery_engine::cleanup");
-  /* Tell handler we don't need the index anymore */
-  if (tab->table->file && tab->table->file->inited)
-    tab->table->file->ha_index_end();
   DBUG_VOID_RETURN;
 }
 

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2012-04-07 09:29:04 +0000
+++ b/sql/sql_select.cc	2012-04-08 00:27:00 +0000
@@ -15116,7 +15116,6 @@
     else
       entry->file->ha_delete_table(entry->s->table_name.str);
     delete entry->file;
-    entry->file= 0;
   }
 
   /* free blobs */



More information about the commits mailing list