[tracker/ontology-cope-for-master: 431/433] libtracker-data: Bugfixes coping with ontology changes in journal replay

[Philip Van Hoof <pvanhoof src gnome org>]

commit 3a3582b1d75ac568badaa6830fddb614c516691f
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Mar 22 14:37:13 2010 +0100

    libtracker-data: Bugfixes coping with ontology changes in journal replay

 src/libtracker-data/tracker-data-manager.c |    3 ---
 src/libtracker-data/tracker-data-update.c  |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index b81b016..dc12536 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -1541,9 +1541,6 @@ tracker_data_manager_init (TrackerDBManagerFlags  flags,
 		/* load ontology from journal into memory */
 		load_ontology_from_journal (&classes, &properties, &id_uri_map);
 
-		/* ensure FTS is fully initialized */
-		tracker_db_interface_execute_query (iface, NULL, "SELECT 1 FROM fulltext.fts WHERE rowid = 0");
-
 		tracker_data_begin_db_transaction_for_replay (tracker_db_journal_reader_get_time ());
 		tracker_db_interface_sqlite_fts_init (TRACKER_DB_INTERFACE_SQLITE (iface), TRUE);
 		tracker_data_ontology_import_into_db (FALSE);
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index c83c012..02de762 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -2286,7 +2286,7 @@ ontology_transaction_end (GList *ontology_queue)
 		                                         queued->predicate, 
 		                                         queued->object, 
 		                                         queued->is_uri, 
-		                                         FALSE, TRUE);
+		                                         TRUE, TRUE);
 
 	}