bzr push into mysql-trunk branch (magnus.blaudd:3732 to 3733) WL#5961

[magnus.blaudd]

 3733 magnus.blaudd@stripped	2012-03-08
      Fix result files for perfschema digest after changing parser for WL#5961

    modified:
      mysql-test/suite/perfschema/r/digest_table_full.result
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
 3732 magnus.blaudd@stripped	2012-03-08 [merge]
      Merge WL#5961 with trunk

    modified:
      mysql-test/r/tablespace.result
      mysql-test/t/tablespace.test
      sql/field.h
      sql/handler.h
      sql/lex.h
      sql/sql_show.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/unireg.cc

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