bzr push into mysql-trunk branch (hemant.hk.kumar:3792 to 3793)

[Hemant Kumar]

 3793 Hemant Kumar	2012-05-07
      Event scheduler is not available at all when the embedded server is used. Including "--source include/not_embedded.inc" to this test.

    modified:
      mysql-test/t/events_time_zone.test
 3792 Vasil Dimov	2012-05-04
      Prevent deadlock between dict_stats_delete_table_stats() and
      dict_stats_save() (which, if occurs, is discovered and one of the two
      would fail).
      
      If ANALYZE TABLE t; (which would cause INSERT/UPDATE) is called at the
      same time with DROP TABLE t; then one of the two may fail.
      
      Because there is a foreign key between the innodb_table_stats and
      innodb_index_stats we must first INSERT/UPDATE into innodb_table_stats
      (parent) and after that into innodb_index_stats (child). But during DELETE
      we must follow the reverse order - first delete from innodb_index_stats
      and later from innodb_table_stats.
      
      To avoid this, we first lock innodb_table_stats during DELETE with
      SELECT ... FOR UPDATE;

    modified:
      storage/innobase/dict/dict0stats.cc
=== modified file 'mysql-test/t/events_time_zone.test'
--- a/mysql-test/t/events_time_zone.test	2008-11-14 16:18:20 +0000
+++ b/mysql-test/t/events_time_zone.test	2012-05-07 10:07:20 +0000
@@ -37,7 +37,9 @@ let $N = 5;
 #
 
 --source include/big_test.inc
-
+#Event scheduler is not available at all when the embedded server is used
+#So this test has to include "not_embedded.inc", like all other tests for the event scheduler
+--source include/not_embedded.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS mysqltest_db1;

No bundle (reason: useless for push emails).