bk commit into 5.0 tree (kroki:1.2118)

[kroki]

Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2118 06/05/06 19:45:24 kroki@stripped +2 -0
  Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
  into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge

  mysql-test/t/func_misc.test
    1.18 06/05/06 19:45:17 kroki@stripped +0 -0
    Auto merged

  mysql-test/r/func_misc.result
    1.23 06/05/06 19:45:17 kroki@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-merge/RESYNC

--- 1.22/mysql-test/r/func_misc.result	2006-05-06 11:18:36 +04:00
+++ 1.23/mysql-test/r/func_misc.result	2006-05-06 19:45:17 +04:00
@@ -70,12 +70,12 @@
 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.17/mysql-test/t/func_misc.test	2006-05-06 11:18:36 +04:00
+++ 1.18/mysql-test/t/func_misc.test	2006-05-06 19:45:17 +04:00
@@ -61,12 +61,14 @@
 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');