[sql] Use IGNORE conflict resolution in recovery.

sql/recovery_unittest.cc

Index: sql/recovery_unittest.cc
diff --git a/sql/recovery_unittest.cc b/sql/recovery_unittest.cc
index 4990e8388d9aee7be0d6d347197430c97557e0d9..e4fdb7b189ebe0bbc9fc5aa73ae20b1e79d1a478 100644
--- a/sql/recovery_unittest.cc
+++ b/sql/recovery_unittest.cc
@@ -371,9 +371,10 @@ TEST_F(SQLRecoveryTest, RecoverCorruptTable) {
   EXPECT_EQ("10", ExecuteWithResults(&db(), kCountSql, "|", ","));
   EXPECT_EQ("10", ExecuteWithResults(&db(), kDistinctSql, "|", ","));
 
-  // The expected value was retained.
+  // Only one of the values is retained.
   const char kSelectSql[] = "SELECT v FROM x WHERE id = 0";
-  EXPECT_EQ("100", ExecuteWithResults(&db(), kSelectSql, "|", ","));
+  const std::string results = ExecuteWithResults(&db(), kSelectSql, "|", ",");
+  EXPECT_TRUE(results=="100" || results=="0") << "Actual results: " << results;

[Scott Hess - ex-Googler, 2016/02/03 22:37:20]

REPLACE retained the last version encountered, IGNORE retains the first eversion
encountered.  But "first" and "last" are anyhow implementation-dependent, so
this change just asserts that the value retained is one of the values inserted.

 }
 
 TEST_F(SQLRecoveryTest, Meta) {