bk commit into 6.0 tree (gluh:1.2671)

[gluh]

Below is the list of changes that have just been committed into a local
6.0 repository of gluh. When gluh 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-15 14:20:00+04:00, gluh@stripped +2 -0
  after merge fix

  mysql-test/suite/falcon/r/ps_8falcon.result@stripped, 2007-11-15 14:19:58+04:00,
gluh@stripped +1 -1
    after merge fix

  mysql-test/suite/falcon/t/falcon_ts.test@stripped, 2007-11-15 14:19:58+04:00, gluh@stripped
+2 -2
    after merge fix

diff -Nrup a/mysql-test/suite/falcon/r/ps_8falcon.result
b/mysql-test/suite/falcon/r/ps_8falcon.result
--- a/mysql-test/suite/falcon/r/ps_8falcon.result	2007-10-25 15:00:15 +05:00
+++ b/mysql-test/suite/falcon/r/ps_8falcon.result	2007-11-15 14:19:58 +04:00
@@ -63,7 +63,7 @@ def	test	t9	t9	c11	c11	246	9	6	Y	0	4	63
 def	test	t9	t9	c12	c12	246	10	6	Y	0	4	63
 def	test	t9	t9	c13	c13	10	10	10	Y	128	0	63
 def	test	t9	t9	c14	c14	12	19	19	Y	128	0	63
-def	test	t9	t9	c15	c15	7	19	19	N	1249	0	63
+def	test	t9	t9	c15	c15	7	19	19	N	9441	0	63
 def	test	t9	t9	c16	c16	11	8	8	Y	128	0	63
 def	test	t9	t9	c17	c17	13	4	4	Y	32864	0	63
 def	test	t9	t9	c18	c18	1	4	1	Y	32768	0	63
diff -Nrup a/mysql-test/suite/falcon/t/falcon_ts.test
b/mysql-test/suite/falcon/t/falcon_ts.test
--- a/mysql-test/suite/falcon/t/falcon_ts.test	2007-11-02 14:13:45 +04:00
+++ b/mysql-test/suite/falcon/t/falcon_ts.test	2007-11-15 14:19:58 +04:00
@@ -3,7 +3,7 @@
 #
 # BUG#31110 - falcon: missing engine check while dropping tablespace
 #
---error 1477
+--error 1478
 CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=MyISAM;
 
 #
@@ -11,7 +11,7 @@ CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.
 #             Unknown error -103
 #
 CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE=falcon;
---error 1655
+--error 1656
 CREATE TABLESPACE ts1 ADD DATAFILE 'ts2.fts' ENGINE=falcon;
 DROP TABLESPACE ts1 ENGINE=falcon;