Ticket #317: fix1.patch

flint_database.cc

@@ -754 +754 @@
         ++new_revision;
         set_revision_number(new_revision);
     } catch (const Xapian::Error &e) {
-        // Modifications failed, and we couldn't recover successfully.
-        throw Xapian::DatabaseError("Modifications failed (" + msg +
-                                    "), and cannot set consistent table "
-                                    "revision numbers: " + e.get_msg());
+        try {
+            // Get back into a consistent state, by reopening tables with old
+            // revision number.
+            open_tables(old_revision);
+        } catch (...) {
+            throw Xapian::DatabaseError("Modifications failed (" + msg +
+                                        "), and cannot set consistent table "
+                                        "revision numbers: " + e.get_msg());
+        }
     }
 }