From: Tor Didriksen
Date: October 7 2010 8:25am
Subject: bzr commit into mysql-trunk-merge branch (tor.didriksen:3231)
List-Archive: http://lists.mysql.com/commits/120198
Message-Id: <20101007082543.92227379F@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2826429384105750497=="

--===============2826429384105750497==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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


--===============2826429384105750497==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   gva9ma5d1sqyhcjo
# target_branch: file:///export/home/didrik/repo/trunk-merge/
# testament_sha1: eb9b0e6e6dc5baae1f7e4680ce9a7354067643a3
# timestamp: 2010-10-07 10:25:43 +0200
# base_revision_id: alexander.nozdrin@stripped\
#   gcddvdnr1270m2ov
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS9NlFgAAYT/gAAQBABQY//3
XiOcAL////RQA62kqrGtUrZsJJIJk0niT0ybRU8AmTTJPU09Taag8oJKEyaaaaNT1BqYpoeoA0Ax
NNGgJJATUwjRqeTQJqNA002oA9TRkHMAAAAAAAAAAHMAAAAAAAAAAT2eGbpyYnyUmOyiZBxhHRus
ywycWMYG4dVxnZmXTmH7hJi5zuLa7nwq64nTD7+mwnfU3kMEdmndrwfuu9qcyMtt54JHGKuFoPtb
uNvfE2S3OxwBOS8Bi8lnXOV/R6XDfYuBC1Q5jJG0c4EyRJzioc8+DIwYWcV2gVybBMVLrUSsJvjG
klO0kyKcn1sI8WSPCO03dz8E67nyUYU4LFqZsGaeMqK0CgOZIuXZUo5TiSqwqLhtezsNGJHEbbUT
aZBRgcTx6tW9FO19Zm4q/JjD5XjxXu1D1XR9DIqvY7GyYhHOuhhIsmb3mJB5N2z+GrjKdiQqMUEp
GvLG/fmEfNw/rxPb6CDqRkrnBxgY1mMhxfVcsdGuY4VDOCjnAmVT5OevMnkNpJjkorcME8yeZZnL
CGMJ0xOuN8VcyZslSRwFS+9K2juy5o6nEHJpNAmEptOUfA0+6HA0mbb/pz9CIjRgGYb5XX6X8U8f
7X9UBw7rAv8Luu6mUe9WYqWB3XpDAZNd+10YaXQboxPF9jxx5gqOG828KowrXKuuH3UuJH6pMYVW
4p+fIYZexkJSPXvRkuLyWYywex1XwPuw6BWwMBbPuCrdYxrhvS88Jr6kE21yqY2XeQWm3RLmMN/l
asQGpNhKVh+NLIVMl1r4IJCbPsvbW6bAEuYyma+Ki5qabzPZDFofxxdyAxK0yxDHDZjPdtfFqleM
jJQUNhTQsk7xzzEd36aHuM7m1Hyp6mBn1kRmjFnLQ+hZ1w37pLhrB5lnqNdp0X23pPqcSArNygQM
iK6h5Qd5b6opkYX+aNENnbjTDalW1YXnDSIeGAJpYAhkBMaE5seydMmkuebkjYonTdhZgmvuoMsj
iKE7RqFGku4Zyek47aoAye4lf3rsVSKEhyZX6+iKFI6xCjFthPzqS8AmCUPVyx2G9bVrUGhWW3My
hI5mMHsWEQ3zGij1dGpaqiYutwB00vRzTaelpFaOKRQLR98YQZaM36ZTnxAsOLQ9S0GhD/GtW8/J
viHyFcrAZNXYsnNf7xmsjgM0sPXQfcXDP76wsSfNyq07yo9T77cKle6is9zzNQqc/EnUS816So9C
FWvoiVmKvqYbhe0LSWpzjiZ/4sf8XckU4UJAvTZRYA==


--===============2826429384105750497==--