database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
This commit is contained in:
kroki@mysql.com
2006-05-06 19:45:24 +04:00
parent 42e35c6be3 e00d7c1bf3
commit f6c95ee81a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/func_misc.result
View File

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

4
mysql-test/t/func_misc.test
View File

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