From: vasil.dimov
Date: July 11 2012 2:30pm
Subject: bzr push into mysql-trunk branch (vasil.dimov:4034 to 4035)
List-Archive: http://lists.mysql.com/commits/144424
Message-Id: <20120711143030.1C54D2E0DE@mail.v5d.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4035 Vasil Dimov	2012-07-11 [merge]
      Merge mysql-5.6 -> mysql-trunk

    modified:
      storage/innobase/row/row0mysql.cc
 4034 Bjorn Munch	2012-07-11 [merge]
      Empty version change upmerge

=== modified file 'storage/innobase/row/row0mysql.cc'
--- a/storage/innobase/row/row0mysql.cc	revid:bjorn.munch@stripped
+++ b/storage/innobase/row/row0mysql.cc	revid:vasil.dimov@stripped
@@ -3724,8 +3724,6 @@ row_drop_table_for_mysql(
 		fil_delete_link_file(name);
 	}
 
-	dict_stats_wait_bg_to_stop_using_tables(table, NULL, trx);
-
 	dict_stats_remove_table_from_auto_recalc(table);
 
 	/* Remove stats for this table and all of its indexes from the

No bundle (reason: useless for push emails).