List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:November 30 2007 3:27am
Subject:bk commit into 6.0 tree (hakank:1.2709)
View as plain text  
Below is the list of changes that have just been committed into a local
6.0 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-11-30 04:26:57+01:00, hakank@lu0011.(none) +6 -0
  Disabled Falcon I_S table, because Falcon is
  not compiled on all platforms.

  mysql-test/r/information_schema.result@stripped, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +1 -5
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/r/information_schema_db.result@stripped, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +0 -1
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/r/mysqlshow.result@stripped, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +0 -2
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/t/information_schema-master.opt@stripped, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +1 -0
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/t/information_schema_db-master.opt@stripped, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +1 -0
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

  mysql-test/t/mysqlshow-master.opt@stripped, 2007-11-30 04:26:54+01:00, hakank@lu0011.(none) +1 -0
    Disabled Falcon I_S table, because Falcon is
    not compiled on all platforms.

diff -Nrup a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result	2007-11-30 01:49:55 +01:00
+++ b/mysql-test/r/information_schema.result	2007-11-30 04:26:54 +01:00
@@ -64,7 +64,6 @@ TABLE_PRIVILEGES
 TRIGGERS
 USER_PRIVILEGES
 VIEWS
-FALCON_VERSION
 columns_priv
 db
 event
@@ -855,7 +854,7 @@ delete from mysql.db where user='mysqlte
 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	29
+information_schema	28
 mysql	22
 create table t1 (i int, j int);
 create trigger trg1 before insert on t1 for each row
@@ -1270,7 +1269,6 @@ TABLE_PRIVILEGES	TABLE_SCHEMA
 TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 VIEWS	TABLE_SCHEMA
-FALCON_VERSION	Version
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -1314,7 +1312,6 @@ TABLE_PRIVILEGES	TABLE_SCHEMA
 TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 VIEWS	TABLE_SCHEMA
-FALCON_VERSION	Version
 SELECT MAX(table_name) FROM information_schema.tables;
 MAX(table_name)
 VIEWS
@@ -1388,7 +1385,6 @@ COLUMNS	information_schema.COLUMNS	1
 COLUMN_PRIVILEGES	information_schema.COLUMN_PRIVILEGES	1
 ENGINES	information_schema.ENGINES	1
 EVENTS	information_schema.EVENTS	1
-FALCON_VERSION	information_schema.FALCON_VERSION	1
 FILES	information_schema.FILES	1
 GLOBAL_STATUS	information_schema.GLOBAL_STATUS	1
 GLOBAL_VARIABLES	information_schema.GLOBAL_VARIABLES	1
diff -Nrup a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
--- a/mysql-test/r/information_schema_db.result	2007-11-30 01:49:56 +01:00
+++ b/mysql-test/r/information_schema_db.result	2007-11-30 04:26:54 +01:00
@@ -33,7 +33,6 @@ TABLE_PRIVILEGES
 TRIGGERS
 USER_PRIVILEGES
 VIEWS
-FALCON_VERSION
 show tables from INFORMATION_SCHEMA like 'T%';
 Tables_in_information_schema (T%)
 TABLES
diff -Nrup a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
--- a/mysql-test/r/mysqlshow.result	2007-11-30 01:49:56 +01:00
+++ b/mysql-test/r/mysqlshow.result	2007-11-30 04:26:54 +01:00
@@ -107,7 +107,6 @@ Database: information_schema
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
 | VIEWS                                 |
-| FALCON_VERSION                        |
 +---------------------------------------+
 Database: INFORMATION_SCHEMA
 +---------------------------------------+
@@ -141,7 +140,6 @@ Database: INFORMATION_SCHEMA
 | TRIGGERS                              |
 | USER_PRIVILEGES                       |
 | VIEWS                                 |
-| FALCON_VERSION                        |
 +---------------------------------------+
 Wildcard: inf_rmation_schema
 +--------------------+
diff -Nrup a/mysql-test/t/information_schema-master.opt b/mysql-test/t/information_schema-master.opt
--- a/mysql-test/t/information_schema-master.opt	2007-09-28 21:54:29 +02:00
+++ b/mysql-test/t/information_schema-master.opt	2007-11-30 04:26:54 +01:00
@@ -9,3 +9,4 @@
 --loose-skip-plugin-falcon_tables
 --loose-skip-plugin-falcon_transaction_summary
 --loose-skip-plugin-falcon_transactions
+--loose-skip-plugin-falcon_version
diff -Nrup a/mysql-test/t/information_schema_db-master.opt b/mysql-test/t/information_schema_db-master.opt
--- a/mysql-test/t/information_schema_db-master.opt	2007-09-28 21:54:29 +02:00
+++ b/mysql-test/t/information_schema_db-master.opt	2007-11-30 04:26:54 +01:00
@@ -9,3 +9,4 @@
 --loose-skip-plugin-falcon_tables
 --loose-skip-plugin-falcon_transaction_summary
 --loose-skip-plugin-falcon_transactions
+--loose-skip-plugin-falcon_version
diff -Nrup a/mysql-test/t/mysqlshow-master.opt b/mysql-test/t/mysqlshow-master.opt
--- a/mysql-test/t/mysqlshow-master.opt	2007-09-28 21:54:29 +02:00
+++ b/mysql-test/t/mysqlshow-master.opt	2007-11-30 04:26:54 +01:00
@@ -9,3 +9,4 @@
 --loose-skip-plugin-falcon_tables
 --loose-skip-plugin-falcon_transaction_summary
 --loose-skip-plugin-falcon_transactions
+--loose-skip-plugin-falcon_version
Thread
bk commit into 6.0 tree (hakank:1.2709)Hakan Kuecuekyilmaz30 Nov