From: Tor Didriksen
Date: August 6 2010 7:39am
Subject: bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3191 to 3192)
 Bug#55648
List-Archive: http://lists.mysql.com/commits/115155
X-Bug: 55648
Message-Id: <20100806073954.9980E3592@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4376099622456327836=="

--===============4376099622456327836==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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


--===============4376099622456327836==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   nulommlmh65onul3
# target_branch: file:///export/home/didrik/repo/next-mr-bf-br1/
# testament_sha1: 838d6faa3cd2bb0b9b28baebe1c418c7f6620692
# timestamp: 2010-08-06 09:39:54 +0200
# base_revision_id: vvaintroub@stripped\
#   4v0fwe0l8uc2j4kd
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcIxaF0AAfrfgAAQWOP/91YA
BAC////wUASd3jQBXTsO4hgSURM1NR4o/UYU2TAkbUGhpoyGNDQ0AGQ0AAAAAGjSk00bSMm1A0AD
QHqAAJFTKYankSepp6U8pmk80po2nqj1BoBJIJpoDQnqBNTymh6npT9SaHqDakqblp39YmR3KLv2
yUWlfWeEY1Tqu9JYGZWNsb09V4ijXIrmLK48S0nfkOcPsJwsZEuwpJbIFw4zOH02CJHcHMIr/fUx
mH9IU1nviMEasaleAGRCvQu44SqjZBFB7i0LzK+wf4iI763xUPAYhBCcJReD3BsOHI7MBGgELEJl
chlecucYf6opxgm1cg8a0LyyKVrI3+ciNRCNqLXrD2sTJv8Bvt9ZzDJT4+m8pEa89zfiR1t3wB55
B7IUUE9ebgmbpEz4JBZeyJq06Gp/lxDkMpcD5auUxjlJYlS1mPRxeBbxkPZ69ChkTMTdaXDoxl2O
tJH2/RdaG9sdqbychlphQmmW3VzaV4LydFheYo3GWMAHrHjh++c7jn2vCtsZJ/w0mKjMPzAyIeCk
NxTMDMkZMdCY6is8AcrDxcdjL0wowYQKGZ9HexqXWVqznz4faZI3AVeZ0HRJd78StuoYlbSZ3Nxo
a4GdGJaZgyE0SCtHW4kx+BAcWYQxlhkxcTOesVnfgX6QsorCRJYEzHnpK1XMZ6MYQaOjk6x4NFnq
SK7HZBdV8N9JNsvD5j49jjE3JoKyQxt/vpOP2hzFkQLWQ7t6uQwnUIDzQ1P2n28IJ28DgPgj8LOc
nhykSqV+XgdXkxrJSS2nI7LAaUUmmYyOkvFW7kvqb8VUfsep1Yyp0FHQ8l0KVZkHgS2dOOBttyN2
zX6OtCQew6wsRUkfc/Kyog+a3kTKaR+PJ1jFkQWh0Roplz5llDPEFcC+kVjcGqWtTQLKCgb8uvUd
8HgyDK7cU7ZombObR56YiGLemBkT1xZxymE+6JDGSAeLUQWZvB5g9hfcu9eZ0LD3UU7So0jGMN61
VcaMRWx9hWY+QDGi5k2I56tpGKubMY+edHXJBBca4FGIkFAV0JS6v6lWbNVCNiHFW0l+CI05YJ5m
OtPkvSZwRYZ5iKaFEtYcwIoZhbEzTLS9Aw477cgGSLy7p3N/mqF7ER3VYHTIuAxoMBJA6yxevf9I
cTskcxh49A76GwrvexEb3E7ROBggA8B6+e35NImDjiktQLUZ/ICJ8VQbIGRNaVJrDhYg3ZCfEWJ7
mOTGGpXSjkXVvwp7YlEvHXwpzggn6sqEquhhYl+Vs5xVpd0EbNacSPfBXijqCHIeH07rbOQi/JmT
oeaGZTDZ9z3bfZKYYtSRtqCrdnixlO3lDSuJCIMcjD4q4mh26upyoQ2jx6YQ8pkTrRrQZraDqyRc
1Vd0jA3HFoHcmicJr7uBwViInKr2uRjUoT5JlkUkLW3jhVqA4JSD4E7Qjm/xdyRThQkMIxaF0A==


--===============4376099622456327836==--