bk commit into 6.0 tree (jas:1.2754)

[Jim Starkey]

Below is the list of changes that have just been committed into a local
6.0 repository of jas. When jas 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-12-14 10:58:01-05:00, jas@stripped +1 -0
  Update expected test result for falcon_ts.

  mysql-test/suite/falcon/r/falcon_ts.result@stripped, 2007-12-14 10:57:58-05:00, jas@stripped +9 -9
    Update expected test result for falcon_ts.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_ts.result b/mysql-test/suite/falcon/r/falcon_ts.result
--- a/mysql-test/suite/falcon/r/falcon_ts.result	2007-12-03 04:29:02 -05:00
+++ b/mysql-test/suite/falcon/r/falcon_ts.result	2007-12-14 10:57:58 -05:00
@@ -12,17 +12,17 @@ CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.
 DROP TABLESPACE ts1 ENGINE=falcon;
 CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
 CREATE TABLE t1(a INT) ENGINE=falcon;
-SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
-TABLESPACE
-FALCON_USER
+SELECT * FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+SCHEMA_NAME	TABLE_NAME	PARTITION	TABLESPACE	INTERNAL_NAME
+TEST	T1		FALCON_USER	T1
 ALTER TABLE t1 TABLESPACE ts1 ENGINE=falcon;
-SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
-TABLESPACE
-ts1
+SELECT * FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+SCHEMA_NAME	TABLE_NAME	PARTITION	TABLESPACE	INTERNAL_NAME
+TEST	T1		ts1	T1
 ALTER TABLE t1 ENGINE=falcon;
-SELECT TABLESPACE FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
-TABLESPACE
-ts1
+SELECT * FROM information_schema.falcon_tables WHERE TABLE_NAME='t1';
+SCHEMA_NAME	TABLE_NAME	PARTITION	TABLESPACE	INTERNAL_NAME
+TEST	T1		ts1	T1
 DROP TABLE t1;
 DROP TABLESPACE ts1 ENGINE=falcon;
 CREATE TABLESPACE `ts 1` ADD DATAFILE 'ts2.fts' ENGINE=falcon;