bzr push into mysql-trunk branch (vasil.dimov:4010 to 4011)

[vasil.dimov]

 4011 Vasil Dimov	2012-07-09 [merge]
      Merge mysql-5.6 -> mysql-trunk

    modified:
      storage/innobase/dict/dict0stats.cc
 4010 Gopal Shankar	2012-07-09
      Bug#13979228 - MEMORY CORRUPTION IN READ_TEXTS() (SQL/DERROR.CC)
      
      A follow-up patch.
      * Makes read_texts() more readable.

    modified:
      sql/derror.cc
      sql/derror.h
      sql/sys_vars.cc
=== modified file 'storage/innobase/dict/dict0stats.cc'
--- a/storage/innobase/dict/dict0stats.cc	revid:gopal.shankar@stripped
+++ b/storage/innobase/dict/dict0stats.cc	revid:vasil.dimov@stripped
@@ -3150,6 +3150,12 @@ dict_stats_update(
 
 			dict_table_stats_lock(table, RW_X_LATCH);
 
+			/* Initialize all stats to dummy values before
+			copying because dict_stats_table_clone_create() does
+			skip corrupted indexes so our dummy object 't' may
+			have less indexes than the real object 'table'. */
+			dict_stats_empty_table(table);
+
 			dict_stats_copy(table, t);
 
 			dict_stats_assert_initialized(table);

No bundle (reason: useless for push emails).