From 8622c1de12d78141d92616826c69f847507171f3 Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Thu, 11 Jul 2013 09:57:01 +0200 Subject: [PATCH] db: explicitly use MyISAM engine InnoDB is the default on some setups. Change-Id: I5cc59854cb88cbec0e7bb7f6aab946252d0bd8e5 --- src/core/util/Database.cc | 4 ++-- src/experiments/ecos_kernel_test/campaign.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/util/Database.cc b/src/core/util/Database.cc index bf18560d..3ca32ed6 100644 --- a/src/core/util/Database.cc +++ b/src/core/util/Database.cc @@ -82,7 +82,7 @@ std::vector Database::get_variants(const std::string &variant " variant varchar(255) NOT NULL," " benchmark varchar(255) NOT NULL," " PRIMARY KEY (id)," - "UNIQUE KEY variant (variant,benchmark))")) { + "UNIQUE KEY variant (variant,benchmark)) ENGINE=MyISAM")) { return result; } @@ -131,7 +131,7 @@ int Database::get_fspmethod_id(const std::string &method) if (!query("CREATE TABLE IF NOT EXISTS fspmethod (" " id int(11) NOT NULL AUTO_INCREMENT," " method varchar(255) NOT NULL," - " PRIMARY KEY (id), UNIQUE KEY method (method))")) { + " PRIMARY KEY (id), UNIQUE KEY method (method)) ENGINE=MyISAM")) { return 0; } diff --git a/src/experiments/ecos_kernel_test/campaign.cc b/src/experiments/ecos_kernel_test/campaign.cc index 79a96c61..ac665de9 100644 --- a/src/experiments/ecos_kernel_test/campaign.cc +++ b/src/experiments/ecos_kernel_test/campaign.cc @@ -265,7 +265,7 @@ bool EcosKernelTestCampaign::run() << " AND p.fspmethod_id = " << fspmethod_id << " " << " AND (" << sql_variants << ") "; #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"; if (!db->query(ss.str().c_str())) return false; unsigned finished_jobs = db->affected_rows();