bk commit into 5.1-falcon tree (hakank:1.2590)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
5.1-falcon repository of hakan. When hakan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-13 01:24:28+02:00, hakank@stripped +4 -0
  Adjusted result file after I_S upgrade for Falcon.

  mysql-test/r/information_schema.result@stripped, 2007-04-13 01:24:26+02:00,
hakank@stripped +33 -1
    Adjusted result file after I_S upgrade for Falcon.

  mysql-test/r/information_schema_db.result@stripped, 2007-04-13 01:24:26+02:00,
hakank@stripped +8 -0
    Adjusted result file after I_S upgrade for Falcon.

  mysql-test/r/mysqlshow.result@stripped, 2007-04-13 01:24:26+02:00, hakank@stripped
+16 -0
    Adjusted result file after I_S upgrade for Falcon.

  sql/sql_yacc.yy@stripped, 2007-04-13 01:24:26+02:00, hakank@stripped +1 -1
    Version number tweaking.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hakank
# Host:	lu0011.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon-to-merge

--- 1.562/sql/sql_yacc.yy	2007-04-06 00:04:24 +02:00
+++ 1.563/sql/sql_yacc.yy	2007-04-13 01:24:26 +02:00
@@ -8784,7 +8784,7 @@
 	  {
 	    LEX *lex=Lex;
 	    lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
-	    WARN_DEPRECATED(yythd, "5.2", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
+	    WARN_DEPRECATED(yythd, "5.3", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'");
 	  }
 	| opt_storage ENGINES_SYM
 	  {

--- 1.150/mysql-test/r/information_schema.result	2007-04-04 22:04:37 +02:00
+++ 1.151/mysql-test/r/information_schema.result	2007-04-13 01:24:26 +02:00
@@ -63,6 +63,14 @@
 TRIGGERS
 USER_PRIVILEGES
 VIEWS
+FALCON_SERIAL_LOG
+FALCON_SYSTEM_MEMORY_DETAIL
+FALCON_SYSTEM_MEMORY_SUMMARY
+FALCON_RECORD_CACHE_SUMMARY
+FALCON_RECORD_CACHE_DETAIL
+FALCON_TRANSACTIONS
+FALCON_DATABASE_IO
+FALCON_SYNCOBJECTS
 columns_priv
 db
 event
@@ -852,7 +860,7 @@
 flush privileges;
 SELECT table_schema, count(*) FROM information_schema.TABLES where
table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY
TABLE_SCHEMA;
 table_schema	count(*)
-information_schema	27
+information_schema	35
 mysql	22
 create table t1 (i int, j int);
 create trigger trg1 before insert on t1 for each row
@@ -1264,6 +1272,14 @@
 TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 VIEWS	TABLE_SCHEMA
+FALCON_SERIAL_LOG	DATABASE
+FALCON_SYSTEM_MEMORY_DETAIL	FILE
+FALCON_SYSTEM_MEMORY_SUMMARY	TOTAL_SPACE
+FALCON_RECORD_CACHE_SUMMARY	TOTAL_SPACE
+FALCON_RECORD_CACHE_DETAIL	FILE
+FALCON_TRANSACTIONS	DATABASE
+FALCON_DATABASE_IO	DATABASE
+FALCON_SYNCOBJECTS	WHERE
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -1306,6 +1322,14 @@
 TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 VIEWS	TABLE_SCHEMA
+FALCON_SERIAL_LOG	DATABASE
+FALCON_SYSTEM_MEMORY_DETAIL	FILE
+FALCON_SYSTEM_MEMORY_SUMMARY	TOTAL_SPACE
+FALCON_RECORD_CACHE_SUMMARY	TOTAL_SPACE
+FALCON_RECORD_CACHE_DETAIL	FILE
+FALCON_TRANSACTIONS	DATABASE
+FALCON_DATABASE_IO	DATABASE
+FALCON_SYNCOBJECTS	WHERE
 SELECT MAX(table_name) FROM information_schema.tables;
 MAX(table_name)
 VIEWS
@@ -1379,6 +1403,14 @@
 COLUMN_PRIVILEGES	information_schema.COLUMN_PRIVILEGES	1
 ENGINES	information_schema.ENGINES	1
 EVENTS	information_schema.EVENTS	1
+FALCON_DATABASE_IO	information_schema.FALCON_DATABASE_IO	1
+FALCON_RECORD_CACHE_DETAIL	information_schema.FALCON_RECORD_CACHE_DETAIL	1
+FALCON_RECORD_CACHE_SUMMARY	information_schema.FALCON_RECORD_CACHE_SUMMARY	1
+FALCON_SERIAL_LOG	information_schema.FALCON_SERIAL_LOG	1
+FALCON_SYNCOBJECTS	information_schema.FALCON_SYNCOBJECTS	1
+FALCON_SYSTEM_MEMORY_DETAIL	information_schema.FALCON_SYSTEM_MEMORY_DETAIL	1
+FALCON_SYSTEM_MEMORY_SUMMARY	information_schema.FALCON_SYSTEM_MEMORY_SUMMARY	1
+FALCON_TRANSACTIONS	information_schema.FALCON_TRANSACTIONS	1
 FILES	information_schema.FILES	1
 GLOBAL_STATUS	information_schema.GLOBAL_STATUS	1
 GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1

--- 1.19/mysql-test/r/information_schema_db.result	2007-03-06 18:29:51 +01:00
+++ 1.20/mysql-test/r/information_schema_db.result	2007-04-13 01:24:26 +02:00
@@ -32,6 +32,14 @@
 TRIGGERS
 USER_PRIVILEGES
 VIEWS
+FALCON_SERIAL_LOG
+FALCON_SYSTEM_MEMORY_DETAIL
+FALCON_SYSTEM_MEMORY_SUMMARY
+FALCON_RECORD_CACHE_SUMMARY
+FALCON_RECORD_CACHE_DETAIL
+FALCON_TRANSACTIONS
+FALCON_DATABASE_IO
+FALCON_SYNCOBJECTS
 show tables from INFORMATION_SCHEMA like 'T%';
 Tables_in_information_schema (T%)
 TABLES

--- 1.6/mysql-test/r/mysqlshow.result	2006-09-14 03:35:47 +02:00
+++ 1.7/mysql-test/r/mysqlshow.result	2007-04-13 01:24:26 +02:00
@@ -106,6 +106,14 @@
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
 | VIEWS                                 |
+| FALCON_SERIAL_LOG                     |
+| FALCON_SYSTEM_MEMORY_DETAIL           |
+| FALCON_SYSTEM_MEMORY_SUMMARY          |
+| FALCON_RECORD_CACHE_SUMMARY           |
+| FALCON_RECORD_CACHE_DETAIL            |
+| FALCON_TRANSACTIONS                   |
+| FALCON_DATABASE_IO                    |
+| FALCON_SYNCOBJECTS                    |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
@@ -138,6 +146,14 @@
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
 | VIEWS                                 |
+| FALCON_SERIAL_LOG                     |
+| FALCON_SYSTEM_MEMORY_DETAIL           |
+| FALCON_SYSTEM_MEMORY_SUMMARY          |
+| FALCON_RECORD_CACHE_SUMMARY           |
+| FALCON_RECORD_CACHE_DETAIL            |
+| FALCON_TRANSACTIONS                   |
+| FALCON_DATABASE_IO                    |
+| FALCON_SYNCOBJECTS                    |
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+