bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3191 to 3192) Bug#55648

[Tor Didriksen]

 3192 Tor Didriksen	2010-08-06
      Bug#55648 post-push fix: remove string 'End of 6.0 tests'

    modified:
      mysql-test/r/func_group.result
      mysql-test/t/func_group.test
 3191 Vladislav Vaintroub	2010-08-05 [merge]
      merge

    modified:
      CMakeLists.txt
      cmake/plugin.cmake
      scripts/CMakeLists.txt
      sql-bench/CMakeLists.txt
      sql/CMakeLists.txt
=== modified file 'mysql-test/r/func_group.result'
--- a/mysql-test/r/func_group.result	2010-08-05 10:47:48 +0000
+++ b/mysql-test/r/func_group.result	2010-08-06 07:35:21 +0000
@@ -1735,5 +1735,3 @@ MAX(c1)
 838:59:59
 DROP TABLE t1;
 # End of the bug#55648
-
-End of 6.0 tests

=== modified file 'mysql-test/t/func_group.test'
--- a/mysql-test/t/func_group.test	2010-08-05 10:47:48 +0000
+++ b/mysql-test/t/func_group.test	2010-08-06 07:35:21 +0000
@@ -1095,7 +1095,6 @@ CREATE TABLE t1(a int, KEY(a));
 INSERT INTO t1 VALUES (1), (2);
 SELECT 1 FROM t1 ORDER BY AVG(DISTINCT a);
 DROP TABLE t1;
---echo End of 6.0 tests
 
 --echo #
 --echo # Bug#55648: Server crash on MIX/MAX on maximum time value


Attachment: [text/bzr-bundle] bzr/[e-mail]