Skip to content

Commit 95aec4b

Browse files
committed
Re-enable test 005.phpt (#41)
I will assume there are no deadlock anymore in this situation in FB5
1 parent 009fbe4 commit 95aec4b

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

tests/005.phpt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
--TEST--
22
InterBase: transactions
33
--SKIPIF--
4-
<?php die('skip: Broken test (Disabled until issue 41 is fixed)'); include("skipif.inc"); ?>
4+
<?php
5+
include("skipif.inc");
6+
if(get_fb_version() >= 5.0)print 'skip: FB >= 5.0';
7+
?>
58
--FILE--
69
<?php
710

11+
// See https://github.com/FirebirdSQL/php-firebird/issues/41
12+
813
require("interbase.inc");
914

1015
ibase_connect($test_base);
1116

12-
@ibase_query("create table test5 (i integer)");
13-
@ibase_query("delete from test5");
17+
ibase_query("create table test5 (i integer)");
18+
//ibase_query("delete from test5");
1419
ibase_close();
1520

1621

@@ -264,7 +269,7 @@ three rows in fourth transaction with deadlock
264269
2
265270
3
266271
4
267-
errmsg [lock conflict on no wait transaction deadlock %a]
272+
errmsg [%s]
268273
---
269274
three rows
270275
--- test5 ---

0 commit comments

Comments
 (0)