bzr push into mysql-trunk branch (vasil.dimov:3768 to 3769)

[vasil.dimov]

 3769 Vasil Dimov	2012-01-23
      In fts_get_total_document_count() the stats of a table should have
      been initialized when the table was opened. This convert a conditional
      stats recalc (if not initialized) to an assert.
      
      Discussed with:	Jimmy (via IM)

    modified:
      storage/innobase/fts/fts0fts.cc
 3768 Vasil Dimov	2012-01-23
      Non-functional change: whitespace fixups in printout messages

    modified:
      storage/innobase/dict/dict0stats.cc
=== modified file 'storage/innobase/fts/fts0fts.cc'
--- a/storage/innobase/fts/fts0fts.cc	revid:vasil.dimov@stripped
+++ b/storage/innobase/fts/fts0fts.cc	revid:vasil.dimov@stripped
@@ -2386,9 +2386,7 @@ fts_get_total_document_count(
 /*=========================*/
 	dict_table_t*   table)		/*!< in: table instance */
 {
-	if (!table->stat_initialized) {
-		dict_stats_update(table, DICT_STATS_RECALC_TRANSIENT, FALSE);
-	}
+	ut_ad(table->stat_initialized);
 
 	return((ulint) table->stat_n_rows);
 }

No bundle (reason: useless for push emails).