bzr push into mysql-trunk-merge branch (tor.didriksen:3230 to 3231)

[Tor Didriksen]

 3231 Tor Didriksen	2010-10-07
      INNODB_METRICS was re-introduced in information_schema by this revision-id
      vasil.dimov@stripped

    modified:
      mysql-test/r/mysqlshow.result
 3230 Alexander Nozdrin	2010-10-06 [merge]
      Auto-merge from mysql-5.5-bugteam.

    added:
      include/welcome_copyright_notice.h
    modified:
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      sql/mysqld.cc
=== modified file 'mysql-test/r/mysqlshow.result'
--- a/mysql-test/r/mysqlshow.result	2010-10-01 15:10:06 +0000
+++ b/mysql-test/r/mysqlshow.result	2010-10-07 08:25:38 +0000
@@ -115,6 +115,7 @@ Database: information_schema
 | INNODB_LOCK_WAITS                     |
 | INNODB_CMPMEM                         |
 | INNODB_CMP                            |
+| INNODB_METRICS                        |
 | INNODB_LOCKS                          |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
@@ -157,6 +158,7 @@ Database: INFORMATION_SCHEMA
 | INNODB_LOCK_WAITS                     |
 | INNODB_CMPMEM                         |
 | INNODB_CMP                            |
+| INNODB_METRICS                        |
 | INNODB_LOCKS                          |
 +---------------------------------------+
 Wildcard: inf_rmation_schema


Attachment: [text/bzr-bundle] bzr/[e-mail]