Commit 253c6133 authored May 06, 2006 by unknown

Merge mysql.com:/home/tomash/src/mysql_ab/mysql-4.1

into  mysql.com:/home/tomash/src/mysql_ab/mysql-4.1-bug16501

parents 02f77d9f f36a42f7

mysql-test/r/func_misc.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -76,13 +76,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

+3 −1

Original line number	Diff line number	Diff line
		@@ -66,12 +66,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');