diff options
| author | unknown <kroki@mysql.com> | 2006-05-06 19:45:24 +0400 |
|---|---|---|
| committer | unknown <kroki@mysql.com> | 2006-05-06 19:45:24 +0400 |
| commit | c27793a3dac208468f899f0c3b1853aaef8dafbc (patch) | |
| tree | c0b12b5859f7882385e7de605484dd2c56d1bfa3 /mysql-test/r/func_misc.result | |
| parent | f9112ce6bae142f998ab4fdfcf14e2b86ae53642 (diff) | |
| parent | 253c61336bd3ae14eaec3a0eb3d47cfb30ca3b1e (diff) | |
| download | mariadb-git-c27793a3dac208468f899f0c3b1853aaef8dafbc.tar.gz | |
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
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 |