bk commit into 6.0 tree (hakank:1.2594)

[Hakan Kuecuekyilmaz]

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-09-22 22:39:15+02:00, hakank@stripped +2 -0
  Fixed test case after merge.

  mysql-test/suite/falcon/r/falcon_bug_27895.result@stripped, 2007-09-22 22:39:11+02:00, hakank@stripped +2 -1
    Fixed test case result.

  mysql-test/suite/falcon/t/falcon_bug_27895.test@stripped, 2007-09-22 22:39:11+02:00, hakank@stripped +1 -1
    Fixed test case.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_27895.result b/mysql-test/suite/falcon/r/falcon_bug_27895.result
--- a/mysql-test/suite/falcon/r/falcon_bug_27895.result	2007-09-20 17:43:11 +02:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_27895.result	2007-09-22 22:39:11 +02:00
@@ -13,8 +13,9 @@ SET storage_engine = 'Falcon';
 SET @@autocommit = 0;
 # Switch to connection default
 START TRANSACTION;
-SELECT a, b FROM t1 WHERE a = 'w';
+SELECT a, b FROM t1 WHERE b = 'w';
 a	b
+1	w
 INSERT INTO t1 VALUES (12, 'w');
 # Switch to connection conn1
 USE db1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_27895.test b/mysql-test/suite/falcon/t/falcon_bug_27895.test
--- a/mysql-test/suite/falcon/t/falcon_bug_27895.test	2007-09-20 17:43:34 +02:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_27895.test	2007-09-22 22:39:11 +02:00
@@ -32,7 +32,7 @@ SET @@autocommit = 0;
 --echo # Switch to connection default
 connection default;
 START TRANSACTION;
-SELECT a, b FROM t1 WHERE a = 'w';
+SELECT a, b FROM t1 WHERE b = 'w';
 INSERT INTO t1 VALUES (12, 'w');
 
 --echo # Switch to connection conn1