diff -r 6168af2507a2 -r 004e4b1efb26 mozilla-bmo1601707.patch
--- a/mozilla-bmo1601707.patch	Sun Feb 09 08:35:05 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-# HG changeset patch
-# Parent  862430a659a4f1fcbbbbfcf1cba98eb7e31035dc
-
-diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
---- a/dom/indexedDB/ActorsParent.cpp
-+++ b/dom/indexedDB/ActorsParent.cpp
-@@ -24612,19 +24612,19 @@ nsresult ObjectStoreAddOrPutRequestOp::D
-     }
-   }
- 
-   // The "|| keyUnset" here is mostly a debugging tool. If a key isn't
-   // specified we should never have a collision and so it shouldn't matter
-   // if we allow overwrite or not. By not allowing overwrite we raise
-   // detectable errors rather than corrupting data.
-   DatabaseConnection::CachedStatement stmt;
--  const auto& optReplaceDirective = (!mOverwrite || keyUnset)
--                                        ? NS_LITERAL_CSTRING("")
--                                        : NS_LITERAL_CSTRING("OR REPLACE ");
-+  const auto optReplaceDirective = (!mOverwrite || keyUnset)
-+                                       ? NS_LITERAL_CSTRING("")
-+                                       : NS_LITERAL_CSTRING("OR REPLACE ");
-   rv = aConnection->GetCachedStatement(
-       NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective +
-           NS_LITERAL_CSTRING("INTO object_data "
-                              "(object_store_id, key, file_ids, data) "
-                              "VALUES (:") +
-           kStmtParamNameObjectStoreId + NS_LITERAL_CSTRING(", :") +
-           kStmtParamNameKey + NS_LITERAL_CSTRING(", :") +
-           kStmtParamNameFileIds + NS_LITERAL_CSTRING(", :") +
-@@ -26452,19 +26452,19 @@ nsresult Cursor::OpenOp::DoIndexDatabase
-   MOZ_ASSERT(mCursor->mType == OpenCursorParams::TIndexOpenCursorParams);
-   MOZ_ASSERT(mCursor->mObjectStoreId);
-   MOZ_ASSERT(mCursor->mIndexId);
- 
-   AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexDatabaseWork", DOM);
- 
-   const bool usingKeyRange = mOptionalKeyRange.isSome();
- 
--  const auto& indexTable = mCursor->mUniqueIndex
--                               ? NS_LITERAL_CSTRING("unique_index_data")
--                               : NS_LITERAL_CSTRING("index_data");
-+  const auto indexTable = mCursor->mUniqueIndex
-+                              ? NS_LITERAL_CSTRING("unique_index_data")
-+                              : NS_LITERAL_CSTRING("index_data");
- 
-   // The result of MakeColumnPairSelectionList is stored in a local variable,
-   // since inlining it into the next statement causes a crash on some Mac OS X
-   // builds (see https://bugzilla.mozilla.org/show_bug.cgi?id=1168606#c110).
-   const auto columnPairSelectionList = MakeColumnPairSelectionList(
-       NS_LITERAL_CSTRING("index_table.value"),
-       NS_LITERAL_CSTRING("index_table.value_locale"), kColumnNameAliasSortKey,
-       mCursor->IsLocaleAware());
-@@ -26558,19 +26558,19 @@ nsresult Cursor::OpenOp::DoIndexKeyDatab
-   MOZ_ASSERT(mCursor->mType == OpenCursorParams::TIndexOpenKeyCursorParams);
-   MOZ_ASSERT(mCursor->mObjectStoreId);
-   MOZ_ASSERT(mCursor->mIndexId);
- 
-   AUTO_PROFILER_LABEL("Cursor::OpenOp::DoIndexKeyDatabaseWork", DOM);
- 
-   const bool usingKeyRange = mOptionalKeyRange.isSome();
- 
--  const auto& table = mCursor->mUniqueIndex
--                          ? NS_LITERAL_CSTRING("unique_index_data")
--                          : NS_LITERAL_CSTRING("index_data");
-+  const auto table = mCursor->mUniqueIndex
-+                         ? NS_LITERAL_CSTRING("unique_index_data")
-+                         : NS_LITERAL_CSTRING("index_data");
- 
-   // The result of MakeColumnPairSelectionList is stored in a local variable,
-   // since inlining it into the next statement causes a crash on some Mac OS X
-   // builds (see https://bugzilla.mozilla.org/show_bug.cgi?id=1168606#c110).
-   const auto columnPairSelectionList = MakeColumnPairSelectionList(
-       NS_LITERAL_CSTRING("value"), NS_LITERAL_CSTRING("value_locale"),
-       kColumnNameAliasSortKey, mCursor->IsLocaleAware());
-   const nsCString sortColumnAlias = NS_LITERAL_CSTRING("SELECT ") +