Below is the list of changes that have just been committed into a local
6.0-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-06-15 22:27:38+02:00, hakank@stripped +5 -0
Adjusted result files.
mysql-test/r/falcon_options.result@stripped, 2007-06-15 22:27:34+02:00, hakank@stripped +0 -2
Falcon parameter falcon_tablespace_mode is no more.
mysql-test/r/falcon_options2.result@stripped, 2007-06-15 22:27:34+02:00, hakank@stripped +0 -1
Falcon parameter falcon_tablespace_mode is no more.
mysql-test/r/information_schema.result@stripped, 2007-06-15 22:27:35+02:00, hakank@stripped +8 -4
New I_S plugin FALCON_TABLES.
mysql-test/r/information_schema_db.result@stripped, 2007-06-15 22:27:35+02:00, hakank@stripped +2 -1
New I_S plugin FALCON_TABLES.
mysql-test/r/mysqlshow.result@stripped, 2007-06-15 22:27:35+02:00, hakank@stripped +4 -2
New I_S plugin FALCON_TABLES.
# 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
--- 1.5/mysql-test/r/falcon_options.result 2007-06-12 19:02:24 +02:00
+++ 1.6/mysql-test/r/falcon_options.result 2007-06-15 22:27:34 +02:00
@@ -10,7 +10,6 @@
falcon_page_cache_size 4194304
falcon_page_size 4096
falcon_record_chill_threshold 5
-falcon_tablespace_mode 0
SELECT @@GLOBAL.falcon_debug_server;
@@GLOBAL.falcon_debug_server
0
@@ -61,4 +60,3 @@
FALCON_PAGE_CACHE_SIZE 4194304
FALCON_PAGE_SIZE 4096
FALCON_RECORD_CHILL_THRESHOLD 5
-FALCON_TABLESPACE_MODE 0
--- 1.5/mysql-test/r/falcon_options2.result 2007-06-12 19:02:24 +02:00
+++ 1.6/mysql-test/r/falcon_options2.result 2007-06-15 22:27:34 +02:00
@@ -11,7 +11,6 @@
FALCON_PAGE_CACHE_SIZE 104857600
FALCON_PAGE_SIZE 16384
FALCON_RECORD_CHILL_THRESHOLD 5
-FALCON_TABLESPACE_MODE 0
SELECT @@falcon_debug_server, @@falcon_log_dir, @@falcon_log_mask,
@@falcon_max_record_memory, @@falcon_min_record_memory,
@@falcon_page_cache_size, @@falcon_page_size;
--- 1.155/mysql-test/r/information_schema.result 2007-06-05 09:45:58 +02:00
+++ 1.156/mysql-test/r/information_schema.result 2007-06-15 22:27:35 +02:00
@@ -63,7 +63,7 @@
TRIGGERS
USER_PRIVILEGES
VIEWS
-FALCON_RECORD_CACHE_SUMMARY
+FALCON_TABLES
FALCON_SYSTEM_MEMORY_DETAIL
FALCON_SYSTEM_MEMORY_SUMMARY
FALCON_SYNCOBJECTS
@@ -72,6 +72,7 @@
FALCON_DATABASE_IO
FALCON_TRANSACTIONS
FALCON_SERIAL_LOG
+FALCON_RECORD_CACHE_SUMMARY
columns_priv
db
event
@@ -859,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 36
+information_schema 37
mysql 22
create table t1 (i int, j int);
create trigger trg1 before insert on t1 for each row
@@ -1271,7 +1272,7 @@
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
VIEWS TABLE_SCHEMA
-FALCON_RECORD_CACHE_SUMMARY TOTAL_SPACE
+FALCON_TABLES SCHEMA
FALCON_SYSTEM_MEMORY_DETAIL FILE
FALCON_SYSTEM_MEMORY_SUMMARY TOTAL_SPACE
FALCON_SYNCOBJECTS WHERE
@@ -1280,6 +1281,7 @@
FALCON_DATABASE_IO DATABASE
FALCON_TRANSACTIONS DATABASE
FALCON_SERIAL_LOG DATABASE
+FALCON_RECORD_CACHE_SUMMARY TOTAL_SPACE
SELECT t.table_name, c1.column_name
FROM information_schema.tables t
INNER JOIN
@@ -1322,7 +1324,7 @@
TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE
VIEWS TABLE_SCHEMA
-FALCON_RECORD_CACHE_SUMMARY TOTAL_SPACE
+FALCON_TABLES SCHEMA
FALCON_SYSTEM_MEMORY_DETAIL FILE
FALCON_SYSTEM_MEMORY_SUMMARY TOTAL_SPACE
FALCON_SYNCOBJECTS WHERE
@@ -1331,6 +1333,7 @@
FALCON_DATABASE_IO DATABASE
FALCON_TRANSACTIONS DATABASE
FALCON_SERIAL_LOG DATABASE
+FALCON_RECORD_CACHE_SUMMARY TOTAL_SPACE
SELECT MAX(table_name) FROM information_schema.tables;
MAX(table_name)
VIEWS
@@ -1411,6 +1414,7 @@
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_TABLES information_schema.FALCON_TABLES 1
FALCON_TRANSACTIONS information_schema.FALCON_TRANSACTIONS 1
FALCON_TRANSACTION_SUMMARY information_schema.FALCON_TRANSACTION_SUMMARY 1
FILES information_schema.FILES 1
--- 1.21/mysql-test/r/information_schema_db.result 2007-05-03 11:27:10 +02:00
+++ 1.22/mysql-test/r/information_schema_db.result 2007-06-15 22:27:35 +02:00
@@ -32,7 +32,7 @@
TRIGGERS
USER_PRIVILEGES
VIEWS
-FALCON_RECORD_CACHE_SUMMARY
+FALCON_TABLES
FALCON_SYSTEM_MEMORY_DETAIL
FALCON_SYSTEM_MEMORY_SUMMARY
FALCON_SYNCOBJECTS
@@ -41,6 +41,7 @@
FALCON_DATABASE_IO
FALCON_TRANSACTIONS
FALCON_SERIAL_LOG
+FALCON_RECORD_CACHE_SUMMARY
show tables from INFORMATION_SCHEMA like 'T%';
Tables_in_information_schema (T%)
TABLES
--- 1.8/mysql-test/r/mysqlshow.result 2007-04-18 09:49:26 +02:00
+++ 1.9/mysql-test/r/mysqlshow.result 2007-06-15 22:27:35 +02:00
@@ -106,7 +106,7 @@
| TRIGGERS |
| USER_PRIVILEGES |
| VIEWS |
-| FALCON_RECORD_CACHE_SUMMARY |
+| FALCON_TABLES |
| FALCON_SYSTEM_MEMORY_DETAIL |
| FALCON_SYSTEM_MEMORY_SUMMARY |
| FALCON_SYNCOBJECTS |
@@ -115,6 +115,7 @@
| FALCON_DATABASE_IO |
| FALCON_TRANSACTIONS |
| FALCON_SERIAL_LOG |
+| FALCON_RECORD_CACHE_SUMMARY |
+---------------------------------------+
Database: INFORMATION_SCHEMA
+---------------------------------------+
@@ -147,7 +148,7 @@
| TRIGGERS |
| USER_PRIVILEGES |
| VIEWS |
-| FALCON_RECORD_CACHE_SUMMARY |
+| FALCON_TABLES |
| FALCON_SYSTEM_MEMORY_DETAIL |
| FALCON_SYSTEM_MEMORY_SUMMARY |
| FALCON_SYNCOBJECTS |
@@ -156,6 +157,7 @@
| FALCON_DATABASE_IO |
| FALCON_TRANSACTIONS |
| FALCON_SERIAL_LOG |
+| FALCON_RECORD_CACHE_SUMMARY |
+---------------------------------------+
Wildcard: inf_rmation_schema
+--------------------+
| Thread |
|---|
| • bk commit into 6.0-falcon tree (hakank:1.2574) | Hakan Kuecuekyilmaz | 15 Jun |
