bzr push into mysql-6.0-falcon branch (hky:2825 to 2826)

[Hakan Kuecuekyilmaz]

 2826 Hakan Kuecuekyilmaz	2008-09-19
      Fixed typo.
modified:
  mysql-test/suite/falcon/r/falcon_bug_22154-big.result

 2825 John H. Embretsen	2008-09-15 [merge]
      Merge of local changes into mysql-6.0-falcon-team branch.
      http://lists.mysql.com/commits/54093
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_23189.result => mysql-test/suite/falcon/r/falcon_bug_23189.result
  mysql-test/suite/falcon_team/t/falcon_bug_23189.test => mysql-test/suite/falcon/t/falcon_bug_23189.test
modified:
  mysql-test/suite/falcon/r/falcon_bug_23189.result
  mysql-test/suite/falcon/t/falcon_bug_23189.test

=== modified file 'mysql-test/suite/falcon/r/falcon_bug_22154-big.result'
--- a/mysql-test/suite/falcon/r/falcon_bug_22154-big.result	2008-04-25 10:46:09 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_22154-big.result	2008-09-19 06:33:20 +0000
@@ -3023,8 +3023,8 @@ update	v
 update	498
 update	v
 update	499
-SELECT count(*) FROM t1;
+SELECT count(*) FROM tj9;
 count(*)
-500
+499
 DROP TABLE tj9;
 DROP PROCEDURE pj9;