Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged

mysql-test/r/func_misc.result

@@ -70,13 +70,13 @@ IS_USED_LOCK('bug16501') = CONNECTION_ID()
 SELECT RELEASE_LOCK('bug16501');
 RELEASE_LOCK('bug16501')
 1
+GET_LOCK('bug16501',600)
+1
 SELECT IS_USED_LOCK('bug16501') = connection_id
 FROM t1
 WHERE conn = 'con1';
 IS_USED_LOCK('bug16501') = connection_id
 1
-GET_LOCK('bug16501',600)
-1
 SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
 IS_USED_LOCK('bug16501') = CONNECTION_ID()
 1

mysql-test/t/func_misc.test

@@ -61,12 +61,14 @@ send SELECT GET_LOCK('bug16501',600);
 connection default;
 SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
 SELECT RELEASE_LOCK('bug16501');
+connection con1;
+reap;
+connection default;
 SELECT IS_USED_LOCK('bug16501') = connection_id
 FROM t1
 WHERE conn = 'con1';
 
 connection con1;
-reap;
 SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
 SELECT RELEASE_LOCK('bug16501');
 SELECT IS_USED_LOCK('bug16501');