diff options
| author | msvensson@neptunus.(none) <> | 2005-09-01 17:15:37 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-09-01 17:15:37 +0200 |
| commit | 305dc010788634f0f8470c1d58a84a0700386f51 (patch) | |
| tree | 80ada8364981cc5d65dec53d473583b35d07abe6 /mysql-test/t/innodb-lock.test | |
| parent | 97820040028187b61da57165aa1d683bb5c8dcff (diff) | |
| parent | 4b47ebcfc9b80fad19ae844b4c67a13ca4af0830 (diff) | |
| download | mariadb-git-305dc010788634f0f8470c1d58a84a0700386f51.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
Diffstat (limited to 'mysql-test/t/innodb-lock.test')
| -rw-r--r-- | mysql-test/t/innodb-lock.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/innodb-lock.test b/mysql-test/t/innodb-lock.test index dd7f4319892..55a712fef9b 100644 --- a/mysql-test/t/innodb-lock.test +++ b/mysql-test/t/innodb-lock.test @@ -39,7 +39,7 @@ set autocommit=0; # The following statement should hang because con1 is locking the page --send lock table t1 write; ---sleep 2; +--sleep 2 connection con1; update t1 set x=1 where id = 0; |