christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Merge commit 'dcd2c021a5ac91d38187d397914e5f51e2fc8819'

Browse Source 
Conflicts:
	tools/import-trace/RegisterImporter.cc

Change-Id: I4f49c976bd60badba73c15746aa03c420cb9f77b
This commit is contained in:
Horst Schirmeier
2013-09-11 14:38:55 +02:00
parent 04e96b977c dcd2c021a5
commit ec969603d5
33 changed files with 690 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/prune-trace/Pruner.cc
View File

@ -71,7 +71,7 @@ bool Pruner::create_database() {
" data_address int(10) unsigned NOT NULL,"
" fspmethod_id int(11) NOT NULL,"
" pilot_id int(11) NOT NULL,"
" PRIMARY KEY (variant_id, data_address, instr2, fspmethod_id, pilot_id),"
" PRIMARY KEY (variant_id, data_address, instr2, fspmethod_id),"
" KEY joinresults (pilot_id,fspmethod_id)) engine=MyISAM";
return db->query(create_statement.c_str());