database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-29 03:22:01 +03:00
Code Activity

mcol-943

Browse Source
This commit is contained in:
david hill
2017-10-19 15:48:39 -05:00
parent 9f8c57e2de
commit 5c34be958b
17 changed files with 155 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
oamapps/mcsadmin/mcsadmin.cpp
View File

@@ -3402,7 +3402,6 @@ int processCommand(string* arguments)
}
}
if (bNeedsConfirm)
{
// confirm request
@@ -3411,24 +3410,8 @@ int processCommand(string* arguments)
}
string MySQLRep;
string MySQLPasswordConfig;
try {
oam.getSystemConfig("MySQLRep", MySQLRep);
oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
}
catch(...) {}
if ( MySQLRep == "y" && MySQLPasswordConfig == oam::UnassignedName ) {
cout << endl;
string prompt = "MariaDB ColumnStore Replication is enabled, is there a 'MariaDB ColumnStore' Password configured in " + HOME + "/.my.cnf (y,n): ";
MySQLPasswordConfig = dataPrompt(prompt);
}
if ( MySQLPasswordConfig != "y" )
MySQLPasswordConfig = "n";
try {
oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
}
catch(...) {}
@@ -4960,26 +4943,6 @@ int processCommand(string* arguments)
if ( password == "")
password = oam::UnassignedName;
string MySQLPasswordConfig;
try {
oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
}
catch(...) {}
if ( MySQLPasswordConfig == oam::UnassignedName ) {
cout << endl;
string prompt = "Is there a 'MariaDB ColumnStore' Password configured on the MariaDB ColumnStore Front-end Modules in " + HOME + "/.my.cnf (y,n): ";
MySQLPasswordConfig = dataPrompt(prompt);
}
if ( MySQLPasswordConfig != "y" )
MySQLPasswordConfig = "n";
try {
oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
}
catch(...) {}
//set flag
try {
oam.setSystemConfig("MySQLRep", "y");
@@ -5451,8 +5414,6 @@ int processCommand(string* arguments)
}
string mysqlpassword = oam::UnassignedName;
try{
cout << endl << "Adding Modules ";
DeviceNetworkList::iterator pt = devicenetworklist.begin();
@@ -5464,7 +5425,7 @@ int processCommand(string* arguments)
cout << "please wait..." << endl;
oam.addModule(devicenetworklist, password, mysqlpassword);
oam.addModule(devicenetworklist, password);
cout << "Add Module(s) successfully completed" << endl;
@@ -5940,26 +5901,6 @@ int processCommand(string* arguments)
break;
}
string MySQLPasswordConfig;
try {
oam.getSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
}
catch(...) {}
if ( MySQLPasswordConfig == oam::UnassignedName ) {
cout << endl;
string prompt = "Is there a 'MariaDB ColumnStore' Password configured on the MariaDB ColumnStore Front-end Modules in " + HOME + "/.my.cnf (y,n): ";
MySQLPasswordConfig = dataPrompt(prompt);
}
if ( MySQLPasswordConfig != "y" )
MySQLPasswordConfig = "n";
try {
oam.setSystemConfig("MySQLPasswordConfig", MySQLPasswordConfig);
}
catch(...) {}
//set flag
try {
oam.setSystemConfig("MySQLRep", "n");