5.1-bugteam->5.5-bugteam merge

f5753919 · Sergey Glukhov · 197e4b2f · 18c28c47 · f5753919 · f5753919
Commit f5753919 authored Dec 21, 2010 by Sergey Glukhov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

mysql-test/r/func_group.result mysql-test/r/func_group.result +1 -0

mysql-test/t/func_group.test mysql-test/t/func_group.test +1 -0

No files found.
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -1735,6 +1735,7 @@ SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b11111111111111111111111111111111
 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
 #

--- a/mysql-test/t/func_group.test
+++ b/mysql-test/t/func_group.test
@@ -1113,6 +1113,7 @@ SELECT MIN(GET_LOCK('aaaaaaaaaaaaaaaaa',0) / '0b11111111111111111111111111111111
 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