diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/SQLiteMutex.h | 2 | ||||
| -rw-r--r-- | storage/moz.build | 4 | ||||
| -rw-r--r-- | storage/mozStorageConnection.cpp | 6 |
3 files changed, 2 insertions, 10 deletions
diff --git a/storage/SQLiteMutex.h b/storage/SQLiteMutex.h index a38525fd6..eaa69eab1 100644 --- a/storage/SQLiteMutex.h +++ b/storage/SQLiteMutex.h @@ -50,7 +50,7 @@ public: mMutex = aMutex; } -#if !defined(DEBUG) || defined(MOZ_SYSTEM_SQLITE) +#if !defined(DEBUG) /** * Acquires the mutex. */ diff --git a/storage/moz.build b/storage/moz.build index 5ccfabd71..2d30a85ec 100644 --- a/storage/moz.build +++ b/storage/moz.build @@ -100,10 +100,6 @@ if CONFIG['MOZ_MEMORY']: DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000 # See Sqlite moz.build for reasoning about TEMP_STORE. -# For system sqlite we cannot use the compile time option, so we use a pragma. -if CONFIG['MOZ_SYSTEM_SQLITE'] and (CONFIG['OS_TARGET'] == 'Android' - or CONFIG['HAVE_64BIT_BUILD']): - DEFINES['MOZ_MEMORY_TEMP_STORE_PRAGMA'] = True LOCAL_INCLUDES += [ '/db/sqlite3/src', diff --git a/storage/mozStorageConnection.cpp b/storage/mozStorageConnection.cpp index 10297fca1..e6c357185 100644 --- a/storage/mozStorageConnection.cpp +++ b/storage/mozStorageConnection.cpp @@ -1955,10 +1955,6 @@ Connection::RemoveProgressHandler(mozIStorageProgressHandler **_oldHandler) NS_IMETHODIMP Connection::SetGrowthIncrement(int32_t aChunkSize, const nsACString &aDatabaseName) { - // Bug 597215: Disk space is extremely limited on Android - // so don't preallocate space. This is also not effective - // on log structured file systems used by Android devices -#if !defined(ANDROID) && !defined(MOZ_PLATFORM_MAEMO) // Don't preallocate if less than 500MiB is available. int64_t bytesAvailable; nsresult rv = mDatabaseFile->GetDiskSpaceAvailable(&bytesAvailable); @@ -1972,7 +1968,7 @@ Connection::SetGrowthIncrement(int32_t aChunkSize, const nsACString &aDatabaseNa : nullptr, SQLITE_FCNTL_CHUNK_SIZE, &aChunkSize); -#endif + return NS_OK; } |