bzr push into mysql-trunk branch (marko.makela:3824 to 3825)

[marko.makela]

 3825 Marko Mäkelä	2012-02-02
      Fix results after fixing typo in trx_rseg_current_size.

    modified:
      mysql-test/suite/innodb/r/innodb_monitor.result
 3824 Marko Mäkelä	2012-02-02 [merge]
      Merge mysql-5.5 to mysql-trunk.

    modified:
      storage/innobase/btr/btr0btr.cc
      storage/innobase/btr/btr0sea.cc
      storage/innobase/buf/buf0buf.cc
      storage/innobase/buf/buf0dblwr.cc
      storage/innobase/ibuf/ibuf0ibuf.cc
      storage/innobase/include/btr0btr.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/page0page.ic
      storage/innobase/lock/lock0lock.cc
      storage/innobase/page/page0cur.cc
      storage/innobase/page/page0page.cc
      storage/innobase/row/row0sel.cc
=== modified file 'mysql-test/suite/innodb/r/innodb_monitor.result'
--- a/mysql-test/suite/innodb/r/innodb_monitor.result	revid:marko.makela@strippedejgtp12h5
+++ b/mysql-test/suite/innodb/r/innodb_monitor.result	revid:marko.makela@strippedfujwzxj6mx0
@@ -132,7 +132,7 @@ trx_active_transactions	disabled
 trx_rseg_history_len	disabled
 trx_undo_slots_used	disabled
 trx_undo_slots_cached	disabled
-trx_rseg_curent_size	disabled
+trx_rseg_current_size	disabled
 purge_del_mark_records	disabled
 purge_upd_exist_or_extern_records	disabled
 purge_invoked	disabled
@@ -336,7 +336,7 @@ trx_active_transactions	enabled
 trx_rseg_history_len	enabled
 trx_undo_slots_used	enabled
 trx_undo_slots_cached	enabled
-trx_rseg_curent_size	enabled
+trx_rseg_current_size	enabled
 purge_del_mark_records	enabled
 purge_upd_exist_or_extern_records	enabled
 purge_invoked	enabled
@@ -542,7 +542,7 @@ trx_active_transactions	disabled
 trx_rseg_history_len	disabled
 trx_undo_slots_used	disabled
 trx_undo_slots_cached	disabled
-trx_rseg_curent_size	disabled
+trx_rseg_current_size	disabled
 purge_del_mark_records	disabled
 purge_upd_exist_or_extern_records	disabled
 purge_invoked	disabled
@@ -746,7 +746,7 @@ trx_active_transactions	0	disabled
 trx_rseg_history_len	0	disabled
 trx_undo_slots_used	0	disabled
 trx_undo_slots_cached	0	disabled
-trx_rseg_curent_size	0	disabled
+trx_rseg_current_size	0	disabled
 purge_del_mark_records	0	disabled
 purge_upd_exist_or_extern_records	0	disabled
 purge_invoked	0	disabled
@@ -1004,7 +1004,7 @@ trx_active_transactions	enabled
 trx_rseg_history_len	enabled
 trx_undo_slots_used	enabled
 trx_undo_slots_cached	enabled
-trx_rseg_curent_size	enabled
+trx_rseg_current_size	enabled
 purge_del_mark_records	enabled
 purge_upd_exist_or_extern_records	enabled
 purge_invoked	enabled
@@ -1208,7 +1208,7 @@ trx_active_transactions	disabled
 trx_rseg_history_len	disabled
 trx_undo_slots_used	disabled
 trx_undo_slots_cached	disabled
-trx_rseg_curent_size	disabled
+trx_rseg_current_size	disabled
 purge_del_mark_records	disabled
 purge_upd_exist_or_extern_records	disabled
 purge_invoked	disabled
@@ -1412,7 +1412,7 @@ trx_active_transactions	enabled
 trx_rseg_history_len	enabled
 trx_undo_slots_used	enabled
 trx_undo_slots_cached	enabled
-trx_rseg_curent_size	enabled
+trx_rseg_current_size	enabled
 purge_del_mark_records	enabled
 purge_upd_exist_or_extern_records	enabled
 purge_invoked	enabled
@@ -1616,7 +1616,7 @@ trx_active_transactions	disabled
 trx_rseg_history_len	disabled
 trx_undo_slots_used	disabled
 trx_undo_slots_cached	disabled
-trx_rseg_curent_size	disabled
+trx_rseg_current_size	disabled
 purge_del_mark_records	disabled
 purge_upd_exist_or_extern_records	disabled
 purge_invoked	disabled
@@ -1820,7 +1820,7 @@ trx_active_transactions	disabled
 trx_rseg_history_len	disabled
 trx_undo_slots_used	disabled
 trx_undo_slots_cached	disabled
-trx_rseg_curent_size	disabled
+trx_rseg_current_size	disabled
 purge_del_mark_records	disabled
 purge_upd_exist_or_extern_records	disabled
 purge_invoked	disabled

No bundle (reason: useless for push emails).