1 diff -up chromium-20090916svn26392/src/chrome/common/sqlite_utils.cc.no-sqlite-debug chromium-20090916svn26392/src/chrome/common/sqlite_utils.cc
2 --- chromium-20090916svn26392/src/chrome/common/sqlite_utils.cc.no-sqlite-debug 2009-09-16 20:15:08.000000000 -0400
3 +++ chromium-20090916svn26392/src/chrome/common/sqlite_utils.cc 2009-09-16 20:16:20.000000000 -0400
4 @@ -42,14 +42,8 @@ class ReleaseSQLErrorHandler : public Va
6 virtual int HandleError(int error, sqlite3* db) {
8 - // TOD(cpu): Remove this code once it has a few days of air time.
9 - if (error == SQLITE_INTERNAL ||
10 - error == SQLITE_NOMEM ||
11 - error == SQLITE_CORRUPT ||
12 - error == SQLITE_IOERR ||
13 - error == SQLITE_CONSTRAINT ||
14 - error == SQLITE_NOTADB)
15 - CHECK(false) << "sqlite fatal error " << error;
16 + // TODO(cpu): need to write to some place so we can trigger
17 + // the diagnostic-repair mode.
21 @@ -283,8 +277,7 @@ int SQLStatement::prepare(sqlite3* db, c
23 int rv = sqlite3_prepare_v2(db, sql, sql_len, &stmt_, NULL);
24 if (rv != SQLITE_OK) {
25 - SQLErrorHandler* error_handler = GetErrorHandlerFactory()->Make();
26 - return error_handler->HandleError(rv, db_handle());
27 + DLOG(ERROR) << "SQLStatement.prepare_v2 failed: " << sqlite3_errmsg(db);