summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-05-13 06:56:07 -0700
committerBernhard Posselt <nukeawhale@gmail.com>2013-05-13 06:56:07 -0700
commit1ec92b6377ee784c6e067a8d7e7c10ebf89367e4 (patch)
treea908de6212ae00c567639fe4d64c1799ddc0e191
parent665663432c63531341bb983e1e8d78dcd6a80db2 (diff)
parent0e55accee2f0843681d0515ffcbd7d5f1970b825 (diff)
downloadnextcloud-server-1ec92b6377ee784c6e067a8d7e7c10ebf89367e4.tar.gz
nextcloud-server-1ec92b6377ee784c6e067a8d7e7c10ebf89367e4.zip
Merge pull request #3329 from owncloud/increase_lock_timeout
Set the SQLite database lock timeout to 60 seconds which is the default ...
-rw-r--r--lib/MDB2/Driver/sqlite3.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index aef0eab9bf1..693ceffa01c 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -387,7 +387,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
$php_errormsg = '';
$this->connection = new SQLite3($database_file);
if(is_callable(array($this->connection, 'busyTimeout'))) {//busy timout is only available in php>=5.3
- $this->connection->busyTimeout(100);
+ $this->connection->busyTimeout(60000);
}
$this->_lasterror = $this->connection->lastErrorMsg();
if (!$this->connection) {