bzr commit into mysql-trunk-merge branch (tor.didriksen:3231)

[Tor Didriksen]

#At file:///export/home/didrik/repo/trunk-merge/ based on revid:alexander.nozdrin@stripped

 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
=== 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]