bzr push into mysql-trunk-innodb branch (vasil.dimov:3315 to 3316)

[vasil.dimov]

 3316 Vasil Dimov	2010-11-11 [merge]
      Merge mysql-5.5-innodb -> mysql-trunk-innodb

    modified:
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/include/dict0dict.h
 3315 Marko Mäkelä	2010-11-11 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      storage/innobase/thr/thr0loc.c
      storage/innobase/trx/trx0i_s.c
=== modified file 'storage/innobase/dict/dict0dict.c'
--- a/storage/innobase/dict/dict0dict.c	revid:marko.makela@stripped
+++ b/storage/innobase/dict/dict0dict.c	revid:[e-mail]-20101111113205-iz12jlf2jyeazuo2
@@ -4622,16 +4622,13 @@ Calculates new estimates for table and i
 are used in query optimization. */
 UNIV_INTERN
 void
-dict_update_statistics_low(
-/*=======================*/
+dict_update_statistics(
+/*===================*/
 	dict_table_t*	table,		/*!< in/out: table */
-	ibool		only_calc_if_missing_stats,/*!< in: only
+	ibool		only_calc_if_missing_stats)/*!< in: only
 					update/recalc the stats if they have
 					not been initialized yet, otherwise
 					do nothing */
-	ibool		has_dict_mutex __attribute__((unused)))
-					/*!< in: TRUE if the caller has the
-					dictionary mutex */
 {
 	dict_index_t*	index;
 	ulint		sum_of_index_sizes	= 0;
@@ -4725,22 +4722,6 @@ dict_update_statistics_low(
 	dict_table_stats_unlock(table, RW_X_LATCH);
 }
 
-/*********************************************************************//**
-Calculates new estimates for table and index statistics. The statistics
-are used in query optimization. */
-UNIV_INTERN
-void
-dict_update_statistics(
-/*===================*/
-	dict_table_t*	table,	/*!< in/out: table */
-	ibool		only_calc_if_missing_stats)/*!< in: only
-					update/recalc the stats if they have
-					not been initialized yet, otherwise
-					do nothing */
-{
-	dict_update_statistics_low(table, only_calc_if_missing_stats, FALSE);
-}
-
 /**********************************************************************//**
 Prints info of a foreign key constraint. */
 static
@@ -4818,9 +4799,7 @@ dict_table_print_low(
 
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 
-	dict_update_statistics_low(table,
-				   FALSE /* update even if initialized */,
-				   TRUE /* we have the dict mutex */);
+	dict_update_statistics(table, FALSE /* update even if initialized */);
 
 	dict_table_stats_lock(table, RW_S_LATCH);
 

=== modified file 'storage/innobase/dict/dict0load.c'
--- a/storage/innobase/dict/dict0load.c	revid:marko.makela@strippedau97ek1x9udww
+++ b/storage/innobase/dict/dict0load.c	revid:vasil.dimov@stripped
@@ -347,11 +347,8 @@ dict_process_sys_tables_rec(
 
 		/* Update statistics if DICT_TABLE_UPDATE_STATS
 		is set */
-		dict_update_statistics_low(*table,
-					   FALSE /* update even if
-						 initialized */,
-					   TRUE /* we have the dict
-						mutex */);
+		dict_update_statistics(*table, FALSE /* update even if
+				       initialized */);
 	}
 
 	return(NULL);

=== modified file 'storage/innobase/include/dict0dict.h'
--- a/storage/innobase/include/dict0dict.h	revid:marko.makela@stripped02812-ysnau97ek1x9udww
+++ b/storage/innobase/include/dict0dict.h	revid:vasil.dimov@strippedjlf2jyeazuo2
@@ -1067,23 +1067,9 @@ Calculates new estimates for table and i
 are used in query optimization. */
 UNIV_INTERN
 void
-dict_update_statistics_low(
-/*=======================*/
-	dict_table_t*	table,		/*!< in/out: table */
-	ibool		only_calc_if_missing_stats,/*!< in: only
-					update/recalc the stats if they have
-					not been initialized yet, otherwise
-					do nothing */
-	ibool		has_dict_mutex);/*!< in: TRUE if the caller has the
-					dictionary mutex */
-/*********************************************************************//**
-Calculates new estimates for table and index statistics. The statistics
-are used in query optimization. */
-UNIV_INTERN
-void
 dict_update_statistics(
 /*===================*/
-	dict_table_t*	table,	/*!< in/out: table */
+	dict_table_t*	table,		/*!< in/out: table */
 	ibool		only_calc_if_missing_stats);/*!< in: only
 					update/recalc the stats if they have
 					not been initialized yet, otherwise

No bundle (reason: useless for push emails).