Skip to content

Commit 3f9b67b

Browse files
committed
Enable tests for multi statements which caused deadlock
After applying workaround for MySQL protocol error these tests should pass. Also change '6-' value to '6suffix' as original one does not throw numeric warning with some server versions.
1 parent fb2631c commit 3f9b67b

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

t/76multi_statement.t

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ my $dbh = DbiTestConnect($test_dsn, $test_user, $test_password,
1313
{ RaiseError => 1, PrintError => 0, AutoCommit => 0,
1414
mariadb_multi_statements => 1 });
1515

16-
if ($dbh->{mariadb_serverversion} < 50025 or ($dbh->{mariadb_serverversion} >= 50100 and $dbh->{mariadb_serverversion} < 50112)) {
17-
plan skip_all => "Server has deadlock bug 16581";
18-
}
19-
20-
if ($dbh->{mariadb_clientversion} < 50025 or ($dbh->{mariadb_clientversion} >= 50100 and $dbh->{mariadb_clientversion} < 50112)) {
21-
plan skip_all => "Client has multiple-result-set detection deadlock bug 15752";
22-
}
23-
2416
plan tests => 36;
2517

2618
ok (defined $dbh, "Connected to database with multi statement support");
@@ -40,7 +32,7 @@ $dbh->{mariadb_server_prepare}= 0;
4032

4133
# Check that more_results works for non-SELECT results too
4234
my $sth;
43-
ok($sth = $dbh->prepare("UPDATE dbd_mysql_t76multi SET a=5 WHERE a=1; UPDATE dbd_mysql_t76multi SET a='6-' WHERE a<4"));
35+
ok($sth = $dbh->prepare("UPDATE dbd_mysql_t76multi SET a=5 WHERE a=1; UPDATE dbd_mysql_t76multi SET a='6suffix' WHERE a<4"));
4436
ok($sth->execute(), "Execute updates");
4537
is($sth->rows, 1, "First update affected 1 row");
4638
is($sth->{mariadb_warning_count}, 0, "First update had no warnings");

0 commit comments

Comments
 (0)