bzr push into mysql-trunk branch (mikael.ronstrom:3886 to 3887)

[Mikael Ronstrom]

 3887 Mikael Ronstrom	2012-05-24
      Changed default of innodb_stats_on_metadata to off

    modified:
      storage/innobase/handler/ha_innodb.cc
 3886 Mikael Ronstrom	2012-05-24
      Change default spin config variable from 6 to 24

    modified:
      storage/innobase/handler/ha_innodb.cc
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:mikael.ronstrom@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:mikael.ronstrom@stripped
@@ -174,7 +174,7 @@ static my_bool	innobase_use_checksums			
 static my_bool	innobase_locks_unsafe_for_binlog	= FALSE;
 static my_bool	innobase_rollback_on_timeout		= FALSE;
 static my_bool	innobase_create_status_file		= FALSE;
-static my_bool	innobase_stats_on_metadata		= TRUE;
+static my_bool	innobase_stats_on_metadata		= FALSE;
 static my_bool	innobase_large_prefix			= FALSE;
 static my_bool	innodb_optimize_fulltext_only		= FALSE;
 
@@ -15039,8 +15039,8 @@ static MYSQL_SYSVAR_BOOL(status_file, in
 static MYSQL_SYSVAR_BOOL(stats_on_metadata, innobase_stats_on_metadata,
   PLUGIN_VAR_OPCMDARG,
   "Enable statistics gathering for metadata commands such as "
-  "SHOW TABLE STATUS for tables that use transient statistics (on by default)",
-  NULL, NULL, TRUE);
+  "SHOW TABLE STATUS for tables that use transient statistics (off by default)",
+  NULL, NULL, FALSE);
 
 static MYSQL_SYSVAR_ULONGLONG(stats_sample_pages, srv_stats_transient_sample_pages,
   PLUGIN_VAR_RQCMDARG,

No bundle (reason: useless for push emails).