From: Sergey Glukhov
Date: December 21 2010 12:32pm
Subject: bzr commit into mysql-5.5-bugteam branch (sergey.glukhov:3221)
List-Archive: http://lists.mysql.com/commits/127415
Message-Id: <201012211242.oBLCVOSh006399@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/gluh/MySQL/mysql-5.5-bugteam/ based on revid:sergey.glukhov@stripped

 3221 Sergey Glukhov	2010-12-21 [merge]
      5.1-bugteam->5.5-bugteam merge
     @ mysql-test/r/func_group.result
        5.1-bugteam->5.5-bugteam merge
     @ mysql-test/t/func_group.test
        5.1-bugteam->5.5-bugteam merge

    modified:
      mysql-test/r/func_group.result
      mysql-test/t/func_group.test
=== modified file 'mysql-test/r/func_group.result'
--- a/mysql-test/r/func_group.result	2010-12-21 11:50:03 +0000
+++ b/mysql-test/r/func_group.result	2010-12-21 12:32:15 +0000
@@ -1735,6 +1735,7 @@ SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',
 SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b1111111111111111111111111111111111111111111111111111111111111111111111111' ^ (RAND()));
 SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b1111111111111111111111111111111111111111111111111111111111111111111111111' ^ (RAND()));
 SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b1111111111111111111111111111111111111111111111111111111111111111111111111' ^ (RAND()));
+SELECT RELEASE_LOCK('aaaaaaaaaaaaaaaaa');
 #
 End of 5.1 tests
 #

=== modified file 'mysql-test/t/func_group.test'
--- a/mysql-test/t/func_group.test	2010-12-21 11:50:03 +0000
+++ b/mysql-test/t/func_group.test	2010-12-21 12:32:15 +0000
@@ -1113,6 +1113,7 @@ SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',
 SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b1111111111111111111111111111111111111111111111111111111111111111111111111' ^ (RAND()));
 SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b1111111111111111111111111111111111111111111111111111111111111111111111111' ^ (RAND()));
 SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b1111111111111111111111111111111111111111111111111111111111111111111111111' ^ (RAND()));
+SELECT RELEASE_LOCK('aaaaaaaaaaaaaaaaa');
 
 --enable_result_log
 

No bundle (reason: revision is a merge).