shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Bug #408: Better MySQL bootstrap, and fix vm_template tests

Browse Source
This commit is contained in:
Carlos Martín 2011-05-06 18:53:31 +02:00
parent 7aacd86c3c
commit b7febc83da
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nebula/Nebula.cc
View File

@ -217,6 +217,14 @@ void Nebula::start()
{
throw runtime_error("Could not create database.");
}
oss.str("");
oss << "USE " << db_name;
rc = db->exec(oss);
if ( rc != 0 )
{
throw runtime_error("Could not open database.");
}
}
NebulaLog::log("ONE",Log::INFO,"Bootstraping OpenNebula database.");

2
src/sql/MySqlDB.cc
View File

@ -44,7 +44,7 @@ MySqlDB::MySqlDB(
// Connect to the server
if (!mysql_real_connect(db, server.c_str(), user.c_str(),
password.c_str(), database.c_str(), port, NULL, 0))
password.c_str(), 0, port, NULL, 0))
{
throw runtime_error("Could not open database.");
}

10
src/vm_template/test/VMTemplatePoolTest.cc
View File

@ -491,9 +491,9 @@ public:
string result = oss.str();
result.replace(128, 10, replacement);
result.replace(391, 10, replacement);
result.replace(656, 10, replacement);
result.replace(130, 10, replacement);
result.replace(393, 10, replacement);
result.replace(658, 10, replacement);
/*
if( result != xml_dump )
@ -527,8 +527,8 @@ public:
string result = oss.str();
result.replace(128, 10, replacement);
result.replace(391, 10, replacement);
result.replace(130, 10, replacement);
result.replace(393, 10, replacement);
/*
if( result != xml_dump_where )