database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-06 16:09:29 +03:00
Code Activity

MCOL-943

Browse Source
This commit is contained in:
root
2017-10-18 09:43:41 -05:00
parent cb9714bd90
commit fa49afa2a5
16 changed files with 137 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
oamapps/mcsadmin/mcsadmin.cpp
View File

@@ -3416,29 +3416,13 @@ 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(...) {}
try
{
try
{
cout << endl << " Check for active transactions" << endl;
if (!bDBRMReady ||
@@ -5015,26 +4999,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");
@@ -6130,26 +6094,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");