# 
# 
# patch "ChangeLog"
#  from [99b0184bf2e45605e72c105142d862225d153dd4]
#    to [d507ff2f161e9110ef392d788fd1aa71e4c261ca]
# 
# patch "database.cc"
#  from [5ade379be3e0877d29e5e01f4ddb2be0ba0175c8]
#    to [cfff81dfe793c7906db79eb9bdd2e443b3794636]
# 
============================================================
--- ChangeLog	99b0184bf2e45605e72c105142d862225d153dd4
+++ ChangeLog	d507ff2f161e9110ef392d788fd1aa71e4c261ca
@@ -1,3 +1,7 @@
+2006-01-18  Nathaniel Smith  <address@hidden>
+
+	* database.cc (begin_transaction): Turn an E() into an I().
+
 2006-01-15  Nathaniel Smith  <address@hidden>
 
 	* AUTHORS: Add Richard as a translator.
============================================================
--- database.cc	5ade379be3e0877d29e5e01f4ddb2be0ba0175c8
+++ database.cc	cfff81dfe793c7906db79eb9bdd2e443b3794636
@@ -666,7 +666,9 @@
     }
   else
     {
-      E(!exclusive || transaction_exclusive, F("Attempt to start exclusive transaction within non-exclusive transaction."));
+      // You can't start an exclusive transaction within a non-exclusive
+      // transaction
+      I(!exclusive || transaction_exclusive);
     }
   transaction_level++;
 }