From dbe1a2cca34016be0491bd7148fa85d54cd41d4d Mon Sep 17 00:00:00 2001 From: Kirill Solomko Date: Mon, 3 Aug 2026 14:28:50 +0200 Subject: [PATCH] MT#65645 sync-db fix $dbh->begin_work() change $dbh->begin_work or die "Cannot start tx: ".. to more appropriate $dbh->begin_work if $dbh->{AutoCommit} so that the transasction starts only if there is none, because since some time a shared $dbh object is used. Change-Id: I2fb6e115c170a5b04a010cb70198182cbbe9712d (cherry picked from commit cf37b2cba514d4b3c5f679978c15d035090a2360) (cherry picked from commit 4550243c3bd95527cb3cdfe9731be447a938e8c5) --- helper/sync-db | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helper/sync-db b/helper/sync-db index b1144622..516cf663 100755 --- a/helper/sync-db +++ b/helper/sync-db @@ -378,7 +378,7 @@ sub do_sync_db_timezones { my $sql = ''; try { - $dbh->begin_work() or die "Cannot start tx: $DBI::errstr\n"; + $dbh->begin_work() if $dbh->{AutoCommit}; my ($cur_tzinfo_version) = $dbh->selectrow_array(<begin_work() or die "Cannot start tx: $DBI::errstr\n"; + $dbh->begin_work() if $dbh->{AutoCommit}; my ($cur_tz_version) = $dbh->selectrow_array(<