From c954b34337f5525a48b8fc5274d50f583b14b080 Mon Sep 17 00:00:00 2001 From: david hill Date: Wed, 13 Jul 2016 15:08:28 -0500 Subject: [PATCH] mcol-138 --- .../columnstoreSupport/columnstoreSupport.cpp | 28 +++++++------- oamapps/mcsadmin/mcsadmin.cpp | 30 +++++++-------- oamapps/postConfigure/helpers.cpp | 26 ++++++------- oamapps/postConfigure/installer.cpp | 8 ++-- oamapps/postConfigure/postConfigure.cpp | 38 +++++++++---------- 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp index 87826dba4..ca514fc41 100644 --- a/oamapps/columnstoreSupport/columnstoreSupport.cpp +++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp @@ -423,7 +423,7 @@ int main(int argc, char *argv[]) cout << "It should be run on the server with the DBRM front-end." << endl; cout << "Check the Admin Guide for additional information." << endl; cout << endl; - cout << "Usage: columnstoreSupport [-h][-a][-hw][-s][-c][-db][-r][-l][-bl][-lc][-p 'root-password'][-mp 'mysql-root-password'][-de]"; + cout << "Usage: columnstoreSupport [-h][-a][-hw][-s][-c][-db][-r][-l][-bl][-lc][-p 'root-password'][-mp 'mariadb-columnstore-root-password'][-de]"; // if hdfs set up print the hadoop option if (!DataFilePlugin.empty()) cout << "[-hd]"; @@ -439,7 +439,7 @@ int main(int argc, char *argv[]) cout << " -bl Output Columnstore Bulk Log Reports only" << endl; cout << " -lc Output Reports for Local Server only" << endl; cout << " -p password (multi-server systems), root-password or 'ssh' to use 'ssh keys'" << endl; - cout << " -mp mysql root user password" << endl; + cout << " -mp MariaDB Columnstore root user password" << endl; cout << " -de Debug Flag" << endl; // if hdfs set up print the hadoop option if (!DataFilePlugin.empty()) @@ -490,7 +490,7 @@ int main(int argc, char *argv[]) else if( string("-mp") == argv[i] ) { i++; if ( argc == i ) { - cout << "ERROR: missing mysql root user password argument" << endl; + cout << "ERROR: missing MariaDB Columnstore root user password argument" << endl; exit(-1); } mysqlpw = argv[i]; @@ -791,7 +791,7 @@ int main(int argc, char *argv[]) string pwprompt = " "; if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") ) { - cout << "NOTE: MySQL root user password is set" << endl; + cout << "NOTE: MariaDB Columnstore root user password is set" << endl; //needs a password, was password entered on command line if ( mysqlpw == " " ) { //go check my.cnf @@ -826,7 +826,7 @@ int main(int argc, char *argv[]) { cout << "NOTE: No password provide on command line or found uncommented in my.cnf" << endl; cout << endl; - string prompt = " *** Enter MySQL password > "; + string prompt = " *** Enter MariaDB Columnstore password > "; mysqlpw = getpass(prompt.c_str()); } } @@ -838,7 +838,7 @@ int main(int argc, char *argv[]) system(cmd.c_str()); if (oam.checkLogStatus("/tmp/idbmysql.log", "ERROR 1045") ) { - cout << "FAILED: Failed login using MySQL root user password '" << mysqlpw << "'" << endl; + cout << "FAILED: Failed login using MariaDB Columnstore root user password '" << mysqlpw << "'" << endl; FAILED = true; } } @@ -852,7 +852,7 @@ int main(int argc, char *argv[]) if ( WEXITSTATUS(ret) == 0) { // run DBMS report info system("echo ' ' >> columnstoreSupportReport.txt"); - system("echo '******************** DBMS Columnstore Mysql Version ********************' >> columnstoreSupportReport.txt"); + system("echo '******************** DBMS Columnstore Version ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); cmd = "echo '################# " + columnstoreMysql + " -e status ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); @@ -862,7 +862,7 @@ int main(int argc, char *argv[]) system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); - system("echo '******************** DBMS Mysql Columnstore System Column ********************' >> columnstoreSupportReport.txt"); + system("echo '******************** DBMS Columnstore System Column ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.syscolumn ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); @@ -872,7 +872,7 @@ int main(int argc, char *argv[]) system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); - system("echo '******************** DBMS Mysql Columnstore System Table ********************' >> columnstoreSupportReport.txt"); + system("echo '******************** DBMS Columnstore System Table ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); cmd = "echo '################# " + columnstoreMysql + " -e desc calpontsys.systable ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); @@ -882,7 +882,7 @@ int main(int argc, char *argv[]) system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); - system("echo '******************** DBMS Mysql Columnstore System Catalog Data ********************' >> columnstoreSupportReport.txt"); + system("echo '******************** DBMS Columnstore System Catalog Data ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); cmd = "echo '################# " + columnstoreMysql + " calpontsys < " + installDir + "/mysql/dumpcat_mysql.sql ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); @@ -892,7 +892,7 @@ int main(int argc, char *argv[]) system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); - system("echo '******************** DBMS Mysql Columnstore System Table Data ********************' >> columnstoreSupportReport.txt"); + system("echo '******************** DBMS Columnstore System Table Data ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); cmd = "echo '################# " + columnstoreMysql + " -e select * from calpontsys.systable ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); @@ -902,7 +902,7 @@ int main(int argc, char *argv[]) system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); - system("echo '******************** DBMS Mysql Columnstore Usernames ********************' >> columnstoreSupportReport.txt"); + system("echo '******************** DBMS Columnstore Usernames ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); cmd = "echo '################# " + columnstoreMysql + " -e show databases ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); @@ -912,7 +912,7 @@ int main(int argc, char *argv[]) system(cmd.c_str()); system("echo ' ' >> columnstoreSupportReport.txt"); - system("echo '******************** DBMS Mysql Columnstore variables ********************' >> columnstoreSupportReport.txt"); + system("echo '******************** DBMS Columnstore variables ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); cmd = "echo '################# " + columnstoreMysql + " show variables ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); @@ -941,7 +941,7 @@ int main(int argc, char *argv[]) } system("echo ' ' >> columnstoreSupportReport.txt"); - system("echo '******************** DBMS Mysql Columnstore config file ********************' >> columnstoreSupportReport.txt"); + system("echo '******************** DBMS Columnstore config file ********************' >> columnstoreSupportReport.txt"); system("echo ' ' >> columnstoreSupportReport.txt"); string cmd = "echo '################# cat /mysql/my.cnf ################# ' >> columnstoreSupportReport.txt"; system(cmd.c_str()); diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index 673963d40..d8bf8147f 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -3147,7 +3147,7 @@ int processCommand(string* arguments) if ( MySQLRep == "y" && MySQLPasswordConfig == oam::UnassignedName ) { cout << endl; - string prompt = "MySQL Replication is enabled, is there a 'MySQL' Password configured in " + HOME + "/.my.cnf (y,n): "; + string prompt = "MariaDB Columnstore Replication is enabled, is there a 'MariaDB Columnstore' Password configured in " + HOME + "/.my.cnf (y,n): "; MySQLPasswordConfig = dataPrompt(prompt); } @@ -4747,7 +4747,7 @@ int processCommand(string* arguments) break; } - case 46: // enableMySQLReplication + case 46: // enableReplication { string MySQLRep; try { @@ -4756,7 +4756,7 @@ int processCommand(string* arguments) catch(...) {} if ( MySQLRep == "y" ) { - string warning = "MySQL Replication Feature is already enabled"; + string warning = "MariaDB Columnstore Replication Feature is already enabled"; // confirm request if (confirmPrompt(warning)) break; @@ -4782,7 +4782,7 @@ int processCommand(string* arguments) if ( MySQLPasswordConfig == oam::UnassignedName ) { cout << endl; - string prompt = "Is there a 'MySQL' Password configured on the MySQL Front-end Modules in " + HOME + "/.my.cnf (y,n): "; + 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); } @@ -4804,7 +4804,7 @@ int processCommand(string* arguments) try { oam.enableMySQLRep(password); - cout << endl << " Successful Enabling of MySQL Replication " << endl << endl; + cout << endl << " Successful Enabling of MariaDB Columnstore Replication " << endl << endl; //display Primary UM Module / Master Node string PrimaryUMModuleName; @@ -4813,11 +4813,11 @@ int processCommand(string* arguments) } catch(...) {} - cout << " MySQL Replication Master Node is " << PrimaryUMModuleName << endl << endl; + cout << " MariaDB Columnstore Replication Master Node is " << PrimaryUMModuleName << endl << endl; } catch (exception& e) { - cout << endl << "**** enableMySQLRep Failed : " << e.what() << endl; + cout << endl << "**** enableRep Failed : " << e.what() << endl; } break; } @@ -5715,7 +5715,7 @@ int processCommand(string* arguments) break; } - case 51: // disableMySQLReplication + case 51: // disableReplication { string MySQLRep; try { @@ -5724,7 +5724,7 @@ int processCommand(string* arguments) catch(...) {} if ( MySQLRep == "n" ) { - string warning = "MySQL Replication Feature is already disable"; + string warning = "MariaDB Columnstore Replication Feature is already disable"; // confirm request if (confirmPrompt(warning)) break; @@ -5738,7 +5738,7 @@ int processCommand(string* arguments) if ( MySQLPasswordConfig == oam::UnassignedName ) { cout << endl; - string prompt = "Is there a 'MySQL' Password configured on the MySQL Front-end Modules in " + HOME + "/.my.cnf (y,n): "; + 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); } @@ -5760,11 +5760,11 @@ int processCommand(string* arguments) try { oam.disableMySQLRep(); - cout << endl << " Successful Disable of MySQL Replication " << endl; + cout << endl << " Successful Disable of MariaDB Columnstore Replication " << endl; } catch (exception& e) { - cout << endl << "**** disableMySQLRep Failed : " << e.what() << endl; + cout << endl << "**** disableRep Failed : " << e.what() << endl; } break; @@ -7866,13 +7866,13 @@ void printSystemStatus() if ( moduletypeconfig.ModuleCount > 1 ) { if ( PrimaryUMModuleName != oam::UnassignedName ) - cout << "Primary Front-End MySQL Module is '" << PrimaryUMModuleName << "'" << endl; + cout << "Primary Front-End MariaDB Columnstore Module is '" << PrimaryUMModuleName << "'" << endl; } } else { if ( PrimaryUMModuleName != oam::UnassignedName ) - cout << "Primary Front-End MySQL Module is '" << PrimaryUMModuleName << "'" << endl; + cout << "Primary Front-End MariaDB Columnstore Module is '" << PrimaryUMModuleName << "'" << endl; } } @@ -7894,7 +7894,7 @@ void printSystemStatus() catch(...) {} if ( MySQLRep == "y" ) - cout << "MySQL Replication Feature is enabled" << endl << endl; + cout << "MariaDB Columnstore Replication Feature is enabled" << endl << endl; } catch (exception& e) { diff --git a/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp index f2576646d..dd3ff7e2e 100644 --- a/oamapps/postConfigure/helpers.cpp +++ b/oamapps/postConfigure/helpers.cpp @@ -275,11 +275,11 @@ void mysqlSetup() string mysqlpw = oam::UnassignedName; try { mysqlpw = oam.getMySQLPassword(false); - cout << "NOTE: Using MySQL password from " + HOME + "/.my.cnf" << endl; + cout << "NOTE: Using MariaDB Columnstore password from " + HOME + "/.my.cnf" << endl; } catch (...) { - cout << endl << "MariDB Columnstore-MySQL login failure, password is assigned. Need MySQL password configuration file " + HOME + "/.my.cnf on local module" << endl; + cout << endl << "MariDB Columnstore login failure, password is assigned. Need MariaDB Columnstore password configuration file " + HOME + "/.my.cnf on local module" << endl; exit(1); } @@ -294,7 +294,7 @@ void mysqlSetup() else { if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) { - cout << endl << "ERROR: MySQL runtime error, exit..." << endl << endl; + cout << endl << "ERROR: MariaDB Columnstore runtime error, exit..." << endl << endl; system("cat /tmp/idbmysql.log"); exit (1); } @@ -474,7 +474,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st returnStatus = sendMsgProcMon( (*pt).DeviceName, msg1, requestID, 600 ); if ( returnStatus != API_SUCCESS) { - cout << "ERROR: Error return in running the MySQL Master DB Distribute, check /tmp/master-dist.logs on " << masterModule << endl; + cout << "ERROR: Error return in running the MariaDB Columnstore Master DB Distribute, check /tmp/master-dist.logs on " << masterModule << endl; return returnStatus; } @@ -486,7 +486,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 ); if ( returnStatus != API_SUCCESS) { - cout << "ERROR: Error return in running the MySQL Master replication, check /tmp/master-rep*.logs on " << masterModule << endl; + cout << "ERROR: Error return in running the MariaDB Columnstore Master replication, check /tmp/master-rep*.logs on " << masterModule << endl; return returnStatus; } @@ -517,7 +517,7 @@ int sendReplicationRequest(int IserverTypeInstall, std::string password, std::st returnStatus = sendMsgProcMon( (*pt).DeviceName, msg, requestID, 30 ); if ( returnStatus != API_SUCCESS) { - cout << "ERROR: Error return in running the MySQL Slave replication, check /tmp/slave-rep*.logs on " << (*pt).DeviceName << endl; + cout << "ERROR: Error return in running the MariaDB Columnstore Slave replication, check /tmp/slave-rep*.logs on " << (*pt).DeviceName << endl; return returnStatus; } @@ -705,12 +705,12 @@ void checkMysqlPort( std::string& mysqlPort, Config* sysConfig ) int size = oldFile.tellg(); if ( size != 0 ) { if ( noPrompting ) { - cout << endl << "The mysqld port of '" + mysqlPort + "' is already in-use" << endl; + cout << endl << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use" << endl; cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl; exit(1); } - cout << "The mysqld port of '" + mysqlPort + "' is already in-use on local server" << endl; + cout << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use on local server" << endl; while(true) { @@ -725,7 +725,7 @@ void checkMysqlPort( std::string& mysqlPort, Config* sysConfig ) if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999) { - cout << " ERROR: Invalid MySQL Port ID supplied, must be between 1000-9999" << endl; + cout << " ERROR: Invalid MariaDB Columnstore Port ID supplied, must be between 1000-9999" << endl; } else break; @@ -781,7 +781,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string int size = oldFile.tellg(); if ( size != 0 ) { if ( noPrompting ) { - cout << endl << "The mysqld port of '" + mysqlPort + "' is already in-use" << endl; + cout << endl << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use" << endl; cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl; exit(1); } @@ -812,7 +812,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string int rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) == 0) { if ( noPrompting ) { - cout << endl << "The mysqld port of '" + mysqlPort + "' is already in-use on " << remoteModuleName << endl; + cout << endl << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use on " << remoteModuleName << endl; cout << "For No-prompt install, use the command line argument of 'port' to enter a different number" << endl; cout << "exiting..." << endl; exit(1); @@ -830,7 +830,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string if ( inUse ) { - cout << endl << "The mysqld port of '" + mysqlPort + "' is already in-use on " << inUseServer << endl; + cout << endl << "The MariaDB Columnstore port of '" + mysqlPort + "' is already in-use on " << inUseServer << endl; while(true) { @@ -845,7 +845,7 @@ void checkSystemMySQLPort(std::string& mysqlPort, Config* sysConfig, std::string if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999) { - cout << " ERROR: Invalid MySQL Port ID supplied, must be between 1000-9999" << endl; + cout << " ERROR: Invalid MariaDB Columnstore Port ID supplied, must be between 1000-9999" << endl; } else break; diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index 12743d725..f00c8dd89 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -758,7 +758,7 @@ int main(int argc, char *argv[]) if ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) { //run the mysql / mysqld setup scripts - cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl; + cout << endl << "Running the MariaDB Columnstore setup scripts" << endl << endl; // call the mysql setup scripts mysqlSetup(); @@ -803,7 +803,7 @@ int main(int argc, char *argv[]) if ( calpont_rpm1 != "dummy.rpm" ) { //run the mysql / mysqld setup scripts - cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl; + cout << endl << "Running the MariaDB Columnstore setup scripts" << endl << endl; // call the mysql setup scripts mysqlSetup(); @@ -823,7 +823,7 @@ int main(int argc, char *argv[]) // //run the mysql / mysqld setup scripts - cout << endl << "Running the MariaDB Columnstore MySQL setup scripts" << endl << endl; + cout << endl << "Running the MariaDB Columnstore setup scripts" << endl << endl; // call the mysql setup scripts mysqlSetup(); @@ -865,7 +865,7 @@ int main(int argc, char *argv[]) cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl; - cout << "Enter 'mcsmysql' to access the MariaDB Columnstore MySQL console" << endl; + cout << "Enter 'mcsmysql' to access the MariaDB Columnstore SQL console" << endl; cout << "Enter 'mcsadmin' to access the MariaDB Columnstore Admin console" << endl << endl; } else diff --git a/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp index e7212dc06..07231fd9b 100644 --- a/oamapps/postConfigure/postConfigure.cpp +++ b/oamapps/postConfigure/postConfigure.cpp @@ -288,9 +288,9 @@ int main(int argc, char *argv[]) cout << " -u Upgrade, Install using the Config File from -c, default to Columnstore.xml.rpmsave" << endl; cout << " If ssh-keys aren't setup, you should provide passwords as command line arguments" << endl; cout << " -p Unix Password, used with no-prompting option" << endl; - cout << " -mp MySQL Password" << endl; + cout << " -mp MariaDB Columnstore Password" << endl; cout << " -s Single Threaded Remote Install" << endl; - cout << " -port MySQL Port Address" << endl; + cout << " -port MariaDB Columnstore Port Address" << endl; exit (0); } else if( string("-s") == argv[i] ) @@ -326,12 +326,12 @@ int main(int argc, char *argv[]) else if( string("-mp") == argv[i] ) { i++; if (i >= argc ) { - cout << " ERROR: MySql Password not provided" << endl; + cout << " ERROR: MariaDB Columnstore Password not provided" << endl; exit (1); } mysqlpw = argv[i]; if ( mysqlpw.find("-") != string::npos ) { - cout << " ERROR: Valid MySQL Password not provided" << endl; + cout << " ERROR: Valid MariaDB Columnstore Password not provided" << endl; exit (1); } if ( mysqlpw == "dummymysqlpw" ) @@ -357,13 +357,13 @@ int main(int argc, char *argv[]) else if( string("-port") == argv[i] ) { i++; if (i >= argc ) { - cout << " ERROR: MySQL Port ID not supplied" << endl; + cout << " ERROR: MariaDB Columnstore Port ID not supplied" << endl; exit (1); } mysqlPort = argv[i]; if ( atoi(mysqlPort.c_str()) < 1000 || atoi(mysqlPort.c_str()) > 9999) { - cout << " ERROR: Invalid MySQL Port ID supplied, must be between 1000-9999" << endl; + cout << " ERROR: Invalid MariaDB Columnstore Port ID supplied, must be between 1000-9999" << endl; exit (1); } } @@ -1045,7 +1045,7 @@ int main(int argc, char *argv[]) cout << endl << "NOTE: Local Query Feature is enabled" << endl; if ( mysqlRep ) - cout << endl << "NOTE: MySQL Replication Feature is enabled" << endl; + cout << endl << "NOTE: MariaDB Columnstore Replication Feature is enabled" << endl; //Write out Updated System Configuration File try { @@ -2735,7 +2735,7 @@ int main(int argc, char *argv[]) if ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM && pmNumber == 1) { //run the mysql / mysqld setup scripts - cout << endl << "===== Running the MariaDB Columnstore MySQL setup scripts =====" << endl << endl; + cout << endl << "===== Running the MariaDB Columnstore MariaDB Columnstore setup scripts =====" << endl << endl; checkMysqlPort(mysqlPort, sysConfig); @@ -2957,7 +2957,7 @@ int main(int argc, char *argv[]) if ( ( IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM ) || ( (IserverTypeInstall != oam::INSTALL_COMBINE_DM_UM_PM) && pmwithum ) ) { - cout << endl << "===== Running the MariaDB Columnstore MySQL setup scripts =====" << endl << endl; + cout << endl << "===== Running the MariaDB Columnstore MariaDB Columnstore setup scripts =====" << endl << endl; // call the mysql setup scripts mysqlSetup(); @@ -3047,7 +3047,7 @@ int main(int argc, char *argv[]) cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "bin/getMySQLpw > /tmp/mysqlpw.log 2>&1"; rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << endl << "MariaDB Columnstore-MySQL login failure, password is assigned. Need MySQL password configuration file " + HOME + "/.my.cnf on " << remoteModuleName << endl; + cout << endl << "MariaDB Columnstore login failure, password is assigned. Need MariaDB Columnstore password configuration file " + HOME + "/.my.cnf on " << remoteModuleName << endl; exit(1); } @@ -3063,20 +3063,20 @@ int main(int argc, char *argv[]) cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/bin/mysql --defaults-file=" + installDir + "/mysql/my.cnf -u root " + pwprompt + " -e status' 1 > /tmp/idbmysql.log 2>&1"; rtnCode = system(cmd.c_str()); if (WEXITSTATUS(rtnCode) != 0) { - cout << endl << "MariaDB Columnstore-MySQL login failure, password mismatch in " + HOME + ".my.cnf on " << remoteModuleName << endl; + cout << endl << "MariaDB Columnstore login failure, password mismatch in " + HOME + ".my.cnf on " << remoteModuleName << endl; exit(1); } } else { if (!oam.checkLogStatus("/tmp/idbmysql.log", "Columnstore") ) { - cout << endl << "ERROR: MySQL runtime error, exit..." << endl << endl; + cout << endl << "ERROR: MariaDB Columnstore runtime error, exit..." << endl << endl; system("cat /tmp/idbmysql.log"); exit (1); } else { - cout << endl << "Additional MySQL Installation steps Successfully Completed on '" + remoteModuleName + "'" << endl << endl; + cout << endl << "Additional MariaDB Columnstore Installation steps Successfully Completed on '" + remoteModuleName + "'" << endl << endl; cmd = installDir + "/bin/remote_command.sh " + remoteModuleIP + " " + password + " '" + installDir + "/mysql/mysql-Columnstore stop'"; int rtnCode = system(cmd.c_str()); @@ -3435,7 +3435,7 @@ int main(int argc, char *argv[]) string start = "y"; cout << "System Installation is complete." << endl; - cout << "If an error occurred while running the MariaDB Columnstore MySQL setup scripts," << endl; + cout << "If an error occurred while running the MariaDB Columnstore setup scripts," << endl; cout << "this will need to be corrected and postConfigure will need to be re-run." << endl << endl; while(true) { @@ -3519,7 +3519,7 @@ int main(int argc, char *argv[]) ( mysqlRep && (umNumber > 1) ) || ( mysqlRep && (pmNumber > 1) && (IserverTypeInstall == oam::INSTALL_COMBINE_DM_UM_PM) ) ) { - cout << endl << "Run MySQL Replication Setup.. "; + cout << endl << "Run MariaDB Columnstore Replication Setup.. "; cout.flush(); //send message to procmon's to run upgrade script @@ -3539,7 +3539,7 @@ int main(int argc, char *argv[]) cout << ". " + installDir + "/bin/columnstoreAlias" << endl << endl; - cout << "Enter 'mcsmysql' to access the MariaDB Columnstore MySQL console" << endl; + cout << "Enter 'mcsmysql' to access the MariaDB Columnstore SQL console" << endl; cout << "Enter 'mcsadmin' to access the MariaDB Columnstore Admin console" << endl << endl; } else @@ -4318,11 +4318,11 @@ bool storageSetup(bool amazonInstall) // get Frontend Data storage type // - cout << "----- Setup User Module MySQL Data Storage Mount Configuration -----" << endl << endl; + cout << "----- Setup User Module MariaDB Columnstore Data Storage Mount Configuration -----" << endl << endl; cout << "There are 2 options when configuring the storage: internal and external" << endl << endl; - cout << " 'internal' - This is specified when a local disk is used for the MySQL Data storage." << endl << endl; - cout << " 'external' - This is specified when the MySQL Data directory is externally mounted." << endl << endl; + cout << " 'internal' - This is specified when a local disk is used for the Data storage." << endl << endl; + cout << " 'external' - This is specified when the MariaDB Columnstore Data directory is externally mounted." << endl << endl; try { UMStorageType = sysConfig->getConfig(InstallSection, "UMStorageType");