diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-19 11:31:34 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-19 11:31:34 +0200 |
| commit | 75689af808d935de69a39138e35cde575c982251 (patch) | |
| tree | c2668ecbca1fc441f2a39eb25cbb54f16181414a /mysql-test/r/trigger.result | |
| parent | 3955e94c34d638df24c5d640558a5aee14342603 (diff) | |
| parent | 54c531607df9b14f206fa8a44f39f2764f55ac82 (diff) | |
| download | mariadb-git-75689af808d935de69a39138e35cde575c982251.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
BitKeeper/deleted/.del-wait_for_slave_io_to_stop.inc:
Auto merged
Diffstat (limited to 'mysql-test/r/trigger.result')
| -rw-r--r-- | mysql-test/r/trigger.result | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index 1b4e0decb62..59ed4511aed 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -1454,19 +1454,22 @@ CREATE TABLE t2 (id INTEGER); INSERT INTO t2 VALUES (1),(2); CREATE TRIGGER t1_test AFTER INSERT ON t1 FOR EACH ROW INSERT INTO t2 VALUES (new.id); -SELECT GET_LOCK('B26162',20); -GET_LOCK('B26162',20) +SELECT GET_LOCK('B26162',120); +GET_LOCK('B26162',120) 1 -SELECT 'rl_acquirer', GET_LOCK('B26162',5), id FROM t2 WHERE id = 1; +SELECT 'rl_acquirer', GET_LOCK('B26162',120), id FROM t2 WHERE id = 1; SET SESSION LOW_PRIORITY_UPDATES=1; SET GLOBAL LOW_PRIORITY_UPDATES=1; INSERT INTO t1 VALUES (5); SELECT 'rl_contender', id FROM t2 WHERE id > 1; SELECT RELEASE_LOCK('B26162'); RELEASE_LOCK('B26162') -0 -rl_acquirer GET_LOCK('B26162',5) id -rl_acquirer 0 1 +1 +rl_acquirer GET_LOCK('B26162',120) id +rl_acquirer 1 1 +SELECT RELEASE_LOCK('B26162'); +RELEASE_LOCK('B26162') +1 rl_contender id rl_contender 2 DROP TRIGGER t1_test; |