bk commit into 5.0 tree (igreenhoe:1.2349)

[Ian Greenhoe]

Below is the list of changes that have just been committed into a local
5.0 repository of greenman. When greenman 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@stripped, 2006-10-31 17:26:41-08:00, igreenhoe@stripped +2 -0
  Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/myapproved/my41-myapproved
  into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/myapproved/my50-myapproved
  MERGE: 1.1616.2144.192

  mysql-test/r/func_misc.result@stripped, 2006-10-31 17:26:35-08:00, igreenhoe@stripped +0 -0
    Auto merged
    MERGE: 1.16.1.6

  mysql-test/t/func_misc.test@stripped, 2006-10-31 17:26:35-08:00, igreenhoe@stripped +0 -0
    Auto merged
    MERGE: 1.11.1.6

# 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:	igreenhoe
# Host:	anubis.greendragongames.com
# Root:	/home/greenman/workspace-mysql/mysql/myapproved/my50-myapproved/RESYNC

--- 1.25/mysql-test/r/func_misc.result	2006-10-31 17:26:49 -08:00
+++ 1.26/mysql-test/r/func_misc.result	2006-10-31 17:26:49 -08:00
@@ -51,42 +51,6 @@ select a from t1 where mid(a+0,6,3) = ( 
 a
 2004-01-06 12:34:00
 drop table t1;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (conn CHAR(7), connection_id INT);
-INSERT INTO t1 VALUES ('default', CONNECTION_ID());
-SELECT GET_LOCK('bug16501',600);
-GET_LOCK('bug16501',600)
-1
-INSERT INTO t1 VALUES ('con1', CONNECTION_ID());
-SELECT IS_USED_LOCK('bug16501') = connection_id
-FROM t1
-WHERE conn = 'default';
-IS_USED_LOCK('bug16501') = connection_id
-1
-SELECT GET_LOCK('bug16501',600);
-SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
-IS_USED_LOCK('bug16501') = CONNECTION_ID()
-1
-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
-SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
-IS_USED_LOCK('bug16501') = CONNECTION_ID()
-1
-SELECT RELEASE_LOCK('bug16501');
-RELEASE_LOCK('bug16501')
-1
-SELECT IS_USED_LOCK('bug16501');
-IS_USED_LOCK('bug16501')
-NULL
-DROP TABLE t1;
 select export_set(3, _latin1'foo', _utf8'bar', ',', 4);
 export_set(3, _latin1'foo', _utf8'bar', ',', 4)
 foo,foo,bar,bar

--- 1.19/mysql-test/t/func_misc.test	2006-10-31 17:26:49 -08:00
+++ 1.20/mysql-test/t/func_misc.test	2006-10-31 17:26:49 -08:00
@@ -38,46 +38,6 @@ select a from t1 where mid(a+0,6,3) = ( 
 
 drop table t1;
 
-
-#
-# Bug#16501: IS_USED_LOCK does not appear to work
-#
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
-CREATE TABLE t1 (conn CHAR(7), connection_id INT);
-INSERT INTO t1 VALUES ('default', CONNECTION_ID());
-
-SELECT GET_LOCK('bug16501',600);
-
-connect (con1,localhost,root,,);
-INSERT INTO t1 VALUES ('con1', CONNECTION_ID());
-SELECT IS_USED_LOCK('bug16501') = connection_id
-FROM t1
-WHERE conn = 'default';
-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;
-SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
-SELECT RELEASE_LOCK('bug16501');
-SELECT IS_USED_LOCK('bug16501');
-
-disconnect con1;
-connection default;
-
-DROP TABLE t1;
-
 #
 # Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
 #