diff options
| author | kroki@mysql.com <> | 2006-05-06 19:45:24 +0400 |
|---|---|---|
| committer | kroki@mysql.com <> | 2006-05-06 19:45:24 +0400 |
| commit | f6c95ee81aa8a3e94f7f011a721d25b0663eddca (patch) | |
| tree | c0b12b5859f7882385e7de605484dd2c56d1bfa3 /mysql-test/r/func_misc.result | |
| parent | 42e35c6be3155273a9c07ad0bc42867304cee3a1 (diff) | |
| parent | e00d7c1bf3de91e10b252c11738d1d22903b68d0 (diff) | |
| download | mariadb-git-f6c95ee81aa8a3e94f7f011a721d25b0663eddca.tar.gz | |
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
Diffstat (limited to 'mysql-test/r/func_misc.result')
| -rw-r--r-- | mysql-test/r/func_misc.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index 67f2f2de3d1..33e642c74c4 100644 --- a/mysql-test/r/func_misc.result +++ b/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 |