From: Sergey Glukhov
Date: December 21 2010 12:30pm
Subject: bzr commit into mysql-5.1-bugteam branch (sergey.glukhov:3532)
List-Archive: http://lists.mysql.com/commits/127414
Message-Id: <201012211240.oBLCQNNM024220@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1156294690426848079=="

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

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

 3532 Sergey Glukhov	2010-12-21
      test case fix
     @ mysql-test/r/func_group.result
        test case fix
     @ mysql-test/t/func_group.test
        test case fix

    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:34:11 +0000
+++ b/mysql-test/r/func_group.result	2010-12-21 12:30:07 +0000
@@ -1735,5 +1735,6 @@ 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:34:11 +0000
+++ b/mysql-test/t/func_group.test	2010-12-21 12:30:07 +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
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergey.glukhov@stripped\
#   0480py5roocv2gx7
# target_branch: file:///home/gluh/MySQL/mysql-5.1-bugteam/
# testament_sha1: b62e8582b573f8d36b6c16200f8feb8d95e3ac47
# timestamp: 2010-12-21 15:30:11 +0300
# base_revision_id: sergey.glukhov@stripped\
#   aggnvlrbao9o1e3o
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWyqWZcAAkvfgEASUOP//3qM
nAC////wUASt4HKG7pT1GtZPCSSMinppT8mKeE1GpppnqZGgeUQPSAJKjIaGTCSaNA01HoCBgCYA
NNKeqbUepoAAAAANAAACKkKeU8FPFPU9NU/VH6NU9NJ6mnqe1IABppoJJJpk0nppDQU8U9MCg8o2
UAaGgeFRtvZm97TRrLudOl2RKcE8wviilkdFh3ktZxNozMEjnwQeGhIeqkiJ8TFj6+xiUldB1bjP
HkoBFjsTnjB971P2A5hG44nY4z5EQJi/CFTSL7CfsamY8sq0SNi0tnpISgJfkRlIzLq4ER8Ei9uQ
rRXAYVIVaE8TVCY93QDmYiAG+D+YW1K7bMsfMC5QZEh6Ou6KFe85aTU69FCiJpgIgOcxCMkgrAmW
1XZHtWhlVzDutUoHkSFIk+aw5wM1ZsYjRxQ0FDojA0VCvv1JBtIIXoYxIWsoOEqjIrLWshivpXC1
uhGcGoz9dkOkCWqSyAyobtSYPRJi13FhoeaZ1vLDBMNZgvW9HyrLUYo4NNGqPJbKmkDgWFhh/i9Z
BlZrTZyLNNbbTe2Ni0aBDK4TjYiOBBTLi/hlgapVsxW0DLmW8Px0l8YjBwnKZmWbeXRZGsHD/lUV
DNxVWPqyQVF9Gy49JLf0K0m0hDMimNugEHDGBQVZUh1iIx2qKi+2+eQnAPjcMC0bZmyOGNFjSZNx
WVQIvTaMufuVOhlacCIYzVXK4mEOeXCBFQyGKgMFhgCLAhZyAzEkrGI0sYVTszHAtR06FmQl+CTU
mBnchjkRsfB+wo+CAfwgPJH7OkSJwEYjLmHJN6+zkcxwtD9x0Hr1QDQ9eHiJc059HKJHijN9JS/i
ieZKpfMcNRxrP7AymUzItjN7KRbaql0JWQ7zgY93M64R1KkgSp2ipo4D/9LHrZhL6CVHdwPCRmzb
CRaDXEfhENcII745YKnDqWtWLomqppNi9HICgc/2UMelNah6rIOXOSLXd2H1I+zUnUBMjKeDM+bV
rWcb9lDQxsVdsuLYcndq9UwY30b/htVrd1mbMpCFAkE9KseI6WXFkfXftanyNO0YyR17RxEd29aO
cnff5K1kMkmRvEt1yJMxG7tA45kNB+7bzbFasE2zl3uYbLbVh72Xc5oRGVaVTfrO6S9Lkme3ranV
lNfC11ZsjlmrsSV9lH5aEnCNJmmbo6Hyv4tYsB4YUYJBJynz4C57IsEebIsVW9OL1Q1VveuLLwIV
o3GMRF6HsV5xOYGVyNtnJIcmdJwLOoKWETirSm6MTzFvSl1iaL4CMklWIt3AbFmrr2GE9TTyxtmB
r1dZOmYwx4c82tQ7/B3pMuqW93YzoFNDbG2ASX2CSSh4KOf24KyN6ojA7Jh3Vg43nBDGSgdJEmsc
53iiYA5DIadFpZkyxeMqjrB5VuBhtNlVLVrDKVkWQRUOW+YiwaEreMJYBJvdmelSuT3UpASoSLql
Y6wIC1PTxySNO/m4NyTRYgR4vSPYQFhoA1bEYKTFhc/7F3JFOFCQbKpZlw==


--===============1156294690426848079==--