bzr push into mysql-6.0 branch (ramil:2789 to 2790) Bug#33300

[Ramil Kalimullin]

 2790 Ramil Kalimullin	2008-08-20
      Merge error in federated.result fixed.
modified:
  mysql-test/r/federated.result

 2789 Jonathan Perkin	2008-08-20 [merge]
      merge fix for bug#33300 into mysql-6.0-bugteam
modified:
  Makefile.am

=== modified file 'mysql-test/r/federated.result'
--- a/mysql-test/r/federated.result	2008-08-20 10:12:11 +0000
+++ b/mysql-test/r/federated.result	2008-08-20 14:44:59 +0000
@@ -781,6 +781,7 @@ id	col1	col2	col3	col4
 SELECT * FROM federated.t1 WHERE col2 LIKE 's%';
 id	col1	col2	col3	col4
 6	6	six six Sixsix	6666	6
+7	7	seven Sevenseven	77777	7777
 SELECT * FROM federated.t1 WHERE col2 LIKE 'si%';
 id	col1	col2	col3	col4
 6	6	six six Sixsix	6666	6