bzr push into mysql-trunk branch (vasil.dimov:3784 to 3785)

[vasil.dimov]

 3785 Vasil Dimov	2012-05-24
      Followup to vasil.dimov@stripped
      
      Remove variable which is only set and not used, causes a compilation
      warning in gcc 4.6 and newer.

    modified:
      storage/innobase/dict/dict0stats.cc
 3784 Vasil Dimov	2012-05-24
      Extend the fix for Bug#13838962 STATISTICS CALCULATION SKIPS DELETE-MARKED
      RECORDS AND CAUSES ASSERTION FAILURE
      
      Counting all delete marked records brings too much nondeterminism because
      purge may or may not have wiped them away when table and index statistics
      are being gathered.
      
      Instead skip delete marked records only on the leaf pages - that is, behave
      as if they do not exist. Delete marks on records on non-leaf pages are
      nonsensical and should not be looked up at all - that is, behave as if
      the non-leaf records do not _contain_ a delete-marked bit.

    modified:
      storage/innobase/dict/dict0stats.cc
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
=== modified file 'storage/innobase/dict/dict0stats.cc'
--- a/storage/innobase/dict/dict0stats.cc	revid:vasil.dimov@stripped
+++ b/storage/innobase/dict/dict0stats.cc	revid:vasil.dimov@stripped
@@ -964,7 +964,6 @@ dict_stats_analyze_index_below_cur(
 	ulint*		offsets1;
 	ulint*		offsets2;
 	ulint*		offsets_rec;
-	ulint		root_height;
 	ib_uint64_t	n_diff; /* the result */
 	ulint		size;
 
@@ -991,8 +990,6 @@ dict_stats_analyze_index_below_cur(
 	rec_offs_set_n_alloc(offsets1, size);
 	rec_offs_set_n_alloc(offsets2, size);
 
-	root_height = btr_page_get_level(btr_root_get(index, mtr), mtr);
-
 	space = dict_index_get_space(index);
 	zip_size = dict_table_zip_size(index->table);
 

No bundle (reason: useless for push emails).