christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

db: explicitly use MyISAM engine

Browse Source 
InnoDB is the default on some setups.

Change-Id: I5cc59854cb88cbec0e7bb7f6aab946252d0bd8e5
This commit is contained in:
Horst Schirmeier
2013-07-11 09:57:01 +02:00
parent 6c9bb21ab3
commit 8622c1de12
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/util/Database.cc
View File

@ -82,7 +82,7 @@ std::vector<Database::Variant> Database::get_variants(const std::string &variant
" variant varchar(255) NOT NULL," " variant varchar(255) NOT NULL,"
" benchmark varchar(255) NOT NULL," " benchmark varchar(255) NOT NULL,"
" PRIMARY KEY (id)," " PRIMARY KEY (id),"
"UNIQUE KEY variant (variant,benchmark))")) { "UNIQUE KEY variant (variant,benchmark)) ENGINE=MyISAM")) {
return result; return result;
} }
@ -131,7 +131,7 @@ int Database::get_fspmethod_id(const std::string &method)
if (!query("CREATE TABLE IF NOT EXISTS fspmethod (" if (!query("CREATE TABLE IF NOT EXISTS fspmethod ("
" id int(11) NOT NULL AUTO_INCREMENT," " id int(11) NOT NULL AUTO_INCREMENT,"
" method varchar(255) NOT NULL," " method varchar(255) NOT NULL,"
" PRIMARY KEY (id), UNIQUE KEY method (method))")) { " PRIMARY KEY (id), UNIQUE KEY method (method)) ENGINE=MyISAM")) {
return 0; return 0;
} }

2
src/experiments/ecos_kernel_test/campaign.cc
View File

@ -265,7 +265,7 @@ bool EcosKernelTestCampaign::run()
<< " AND p.fspmethod_id = " << fspmethod_id << " " << " AND p.fspmethod_id = " << fspmethod_id << " "
<< " AND (" << sql_variants << ") "; << " AND (" << sql_variants << ") ";
#elif 1 #elif 1
if (!db->query("CREATE TEMPORARY TABLE done_pilots (id INT UNSIGNED NOT NULL PRIMARY KEY)")) return false; if (!db->query("CREATE TEMPORARY TABLE done_pilots (id INT UNSIGNED NOT NULL PRIMARY KEY) ENGINE=MyISAM")) return false;
ss << "INSERT INTO done_pilots SELECT pilot_id FROM " << m_result_table << " GROUP BY pilot_id HAVING SUM(bit_width) = 8"; ss << "INSERT INTO done_pilots SELECT pilot_id FROM " << m_result_table << " GROUP BY pilot_id HAVING SUM(bit_width) = 8";
if (!db->query(ss.str().c_str())) return false; if (!db->query(ss.str().c_str())) return false;
unsigned finished_jobs = db->affected_rows(); unsigned finished_jobs = db->affected_rows();