List:Commits« Previous MessageNext Message »
From:Sergey Glukhov Date:December 21 2010 12:34pm
Subject:bzr commit into mysql-trunk-bugfixing branch (sergey.glukhov:3461)
View as plain text  
#At file:///home/gluh/MySQL/mysql-trunk-bugfixing/ based on revid:sergey.glukhov@stripped

 3461 Sergey Glukhov	2010-12-21 [merge]
      5.5-bugteam->trunk-bugfixing merge
     @ mysql-test/r/func_group.result
        5.5-bugteam->trunk-bugfixing merge
     @ mysql-test/t/func_group.test
        5.5-bugteam->trunk-bugfixing 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 12:27:36 +0000
+++ b/mysql-test/r/func_group.result	2010-12-21 12:34:13 +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 12:27:36 +0000
+++ b/mysql-test/t/func_group.test	2010-12-21 12:34:13 +0000
@@ -1114,6 +1114,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).
Thread
bzr commit into mysql-trunk-bugfixing branch (sergey.glukhov:3461) Sergey Glukhov21 Dec