  SELECT t.table_name, c1.column_name
  FROM information_schema.tables t
  INNER JOIN
-@@ -1306,6 +1322,13 @@
+@@ -1310,6 +1326,13 @@
  TRIGGERS	TRIGGER_SCHEMA
  USER_PRIVILEGES	GRANTEE
  VIEWS	TABLE_SCHEMA

diff mysql-test/r/information_schema.result.orig mysql-test/r/information_schema.result
--- mysql-test/r/information_schema.result.orig	2008-08-04 09:27:49.000000000 +0300
+++ mysql-test/r/information_schema.result	2008-10-07 11:21:51.000000000 +0300
@@ -64,6 +64,13 @@
 TRIGGERS
 USER_PRIVILEGES
 VIEWS

+INNODB_CMPMEM	page_size
+INNODB_CMP	page_size
+INNODB_LOCKS	lock_id
 SELECT MAX(table_name) FROM information_schema.tables WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test');
 MAX(table_name)
 VIEWS
@@ -1386,6 +1409,13 @@
 FILES	information_schema.FILES	1
 GLOBAL_STATUS	information_schema.GLOBAL_STATUS	1
 GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1
