bzr push into mysql-trunk branch (marc.alff:3543 to 3544)

[Marc Alff]

 3544 Marc Alff	2011-11-02
      Fixed code review comments.
      
      Table io and table lock events should set the nesting event type and nesting event id

    modified:
      storage/perfschema/pfs.cc
 3543 Marc Alff	2011-11-02 [merge]
      Local merge from mysql-trunk

    modified:
      mysql-test/collections/default.experimental
      mysql-test/include/index_merge1.inc
      mysql-test/include/index_merge2.inc
      mysql-test/include/index_merge_ror.inc
      mysql-test/r/index_merge_innodb.result
      mysql-test/t/index_merge_innodb.test

Diff too large for email (10527 lines, the limit is 10000).
No bundle (reason: useless for push emails).