Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(65)

Unified Diff: third_party/sqlite/src/src/shell.c

Issue 9144001: The complete work-in-progress SQLite recover virtual table. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sigh, forgot to specify baseline. Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/src/recover.c ('k') | third_party/sqlite/src/src/shell_icu_linux.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/src/shell.c
diff --git a/third_party/sqlite/src/src/shell.c b/third_party/sqlite/src/src/shell.c
index 13685c2c184b84c8a068964cf2d2264a0a3c778c..f168412fbce04e2508cf8fa8d4b3fff9ea93a604 100644
--- a/third_party/sqlite/src/src/shell.c
+++ b/third_party/sqlite/src/src/shell.c
@@ -81,6 +81,8 @@ static int enableTimer = 0;
/* Saved resource information for the beginning of an operation */
static struct rusage sBegin;
+int recoverVtableInit(sqlite3 *db);
+
/*
** Begin timing an operation
*/
@@ -1388,6 +1390,10 @@ static void open_db(struct callback_data *p){
#ifndef SQLITE_OMIT_LOAD_EXTENSION
sqlite3_enable_load_extension(p->db, 1);
#endif
+ if (recoverVtableInit(db) != SQLITE_OK) {
+ fprintf(stderr, "Error: unable to init recover vtable \"%s\": %s\n",
+ p->zDbFilename, sqlite3_errmsg(db));
+ }
}
}
@@ -2663,6 +2669,7 @@ int main(int argc, char **argv){
int i;
int rc = 0;
+#if 0
/* Begin evanm patch. */
extern int sqlite_shell_init_icu();
if( !sqlite_shell_init_icu() ){
@@ -2670,6 +2677,7 @@ int main(int argc, char **argv){
"queries against ICU FTS tables will fail.\n", argv[0]);
}
/* End evanm patch. */
+#endif
Argv0 = argv[0];
main_init(&data);
« no previous file with comments | « third_party/sqlite/src/src/recover.c ('k') | third_party/sqlite/src/src/shell_icu_linux.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698