Merge zizzer.eecs.umich.edu:/bk/newmem

into  ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86

--HG--
extra : convert_revision : b585cea2221377eb2fceea8976c46a17c0034f51

2 files changed, 6 insertions, 9 deletions

diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index d4035986b..39a687fff 100644
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -930,7 +930,7 @@ MySql::visit(const FormulaData &data)
 
 bool
 initMySQL(string host, string user, string password, string database,
-          string name, string sample, string project)
+          string project, string name, string sample)
 {
     extern list<Output *> OutputList;
     static MySql mysql;
@@ -938,9 +938,6 @@ initMySQL(string host, string user, string password, string database,
     if (mysql.connected())
         return false;
 
-    if (user.empty())
-        user = username();
-
     mysql.connect(host, user, password, database, name, sample, project);
     OutputList.push_back(&mysql);
 
diff --git a/src/base/stats/mysql.hh b/src/base/stats/mysql.hh
index 52f93ac61..0ce381c2f 100644
--- a/src/base/stats/mysql.hh
+++ b/src/base/stats/mysql.hh
@@ -187,15 +187,15 @@ class MySql : public Output
     void configure(const FormulaData &data);
 };
 
-bool initMySQL(std::string host, std::string database, std::string user = "",
-    std::string passwd = "", std::string name = "test",
-    std::string sample = "0", std::string project = "test");
+bool initMySQL(std::string host, std::string database, std::string user,
+               std::string passwd, std::string project, std::string name,
+               std::string sample);
 
 #if !USE_MYSQL
 inline bool
 initMySQL(std::string host, std::string user, std::string password,
-    std::string database, std::string name, std::string sample,
-    std::string project)
+          std::string database, std::string project, std::string name,
+          std::string sample)
 {
     return false;
 }