blob: 0e0684251df1c41232d9c5cf6f5cc1b7bdda254b (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
Index: Slim/Schema.pm
===================================================================
--- Slim/Schema.pm (revision 31006)
+++ Slim/Schema.pm (working copy)
@@ -274,11 +274,15 @@
# For custom exceptions
$class->storage_type('Slim::Schema::Storage');
+ # Don't use autocommit mode for the scanner.
+ # Needs to be set here as setting dbh->{'AutoCommit'} = 0 later
+ # confusing the transaction nesting logic.
+ my $AutoCommit = (main::SCANNER ? 0 : 1);
my $on_connect_do = $sqlHelperClass->on_connect_do();
$class->connection( $dsn || $source, $username, $password, {
RaiseError => 1,
- AutoCommit => 1,
+ AutoCommit => $AutoCommit,
PrintError => 0,
Taint => 1,
on_connect_do => [
Index: scanner.pl
===================================================================
--- scanner.pl (revision 31006)
+++ scanner.pl (working copy)
@@ -236,9 +236,6 @@
main::INFOLOG && $log->info("Squeezebox Server Scanner done init...\n");
- # Take the db out of autocommit mode - this makes for a much faster scan.
- Slim::Schema->storage->dbh->{'AutoCommit'} = 0;
-
my $scanType = 'SETUP_STANDARDRESCAN';
if ($wipe) {
--------------020502080403070605040408--
|
