import-/prune-trace: primary keys reordered

data_address is definitely part of the unique key to trace entries, but
instr2 is arbitrary (could be instr1, time1 or time2 as well).  Moving
data_address up the hierarchy to speed up certain FSP experiments.

Change-Id: I37a1f6c1e5b3957ba2f5bf46e0cd1a9c4aa7bfef

tools/import-trace/Importer.cc

@@ -30,7 +30,7 @@ bool Importer::create_database() {
 		"	data_address int(10) unsigned NOT NULL,"
 		"	width tinyint(3) unsigned NOT NULL,"
 		"	accesstype enum('R','W') NOT NULL,"
-		"	PRIMARY KEY (variant_id,instr2,data_address)"
+		"	PRIMARY KEY (variant_id,data_address,instr2)"
 		") engine=MyISAM ";
 	return db->query(create_statement.c_str());
 }