diff --git a/oam/install_scripts/columnstoreAlias b/oam/install_scripts/columnstoreAlias index 255eb7e7e..623cf26b8 100644 --- a/oam/install_scripts/columnstoreAlias +++ b/oam/install_scripts/columnstoreAlias @@ -4,7 +4,7 @@ alias mcsmysql='/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-extra- alias ma=/usr/local/mariadb/columnstore/bin/mcsadmin alias mcsadmin=/usr/local/mariadb/columnstore/bin/mcsadmin alias cpimport=/usr/local/mariadb/columnstore/bin/cpimport -alias home='cd /usr/local/mariadb/columnstore' +alias mcshome='cd /usr/local/mariadb/columnstore' alias log='cd /var/log/mariadb/columnstore/' alias core='cd /var/log/mariadb/columnstore/corefiles' alias tmsg='tail -f /var/log/messages' @@ -14,4 +14,4 @@ alias terror='tail -f /var/log/mariadb/columnstore/err.log' alias twarning='tail -f /var/log/mariadb/columnstore/warning.log' alias tcrit='tail -f /var/log/mariadb/columnstore/crit.log' alias dbrm='cd /usr/local/mariadb/columnstore/data1/systemFiles/dbrm' -alias module='cat /usr/local/mariadb/columnstore/local/module' +alias mcsmodule='cat /usr/local/mariadb/columnstore/local/module' diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp index a7c7308bc..7f785153e 100644 --- a/oamapps/postConfigure/mycnfUpgrade.cpp +++ b/oamapps/postConfigure/mycnfUpgrade.cpp @@ -54,38 +54,39 @@ using namespace std; using namespace oam; -/* MCOL-1844. On an upgrade, the user may have customized options in their old + +/* MCOL-1844. On an upgrade, the user may have customized options in their old * myCnf-include-args.text file. Merge it with the packaged version, and then process as we * have before. */ string rtrim(const string &in) { - string::const_reverse_iterator rbegin = in.rbegin(); - while (rbegin != in.rend() && isspace(*rbegin)) - ++rbegin; - return string(in.begin(), rbegin.base()); + string::const_reverse_iterator rbegin = in.rbegin(); + while (rbegin != in.rend() && isspace(*rbegin)) + ++rbegin; + return string(in.begin(), rbegin.base()); } -void mergeMycnfIncludeArgs() +void mergeMycnfIncludeArgs() { - string userArgsFilename = startup::StartUp::installDir() + "/bin/myCnf-include-args.text.rpmsave"; - string packagedArgsFilename = startup::StartUp::installDir() + "/bin/myCnf-include-args.text"; - ifstream userArgs(userArgsFilename.c_str()); - fstream packagedArgs(packagedArgsFilename.c_str(), ios::in); + string userArgsFilename = startup::StartUp::installDir() + "/bin/myCnf-include-args.text.rpmsave"; + string packagedArgsFilename = startup::StartUp::installDir() + "/bin/myCnf-include-args.text"; + ifstream userArgs(userArgsFilename.c_str()); + fstream packagedArgs(packagedArgsFilename.c_str(), ios::in); - if (!userArgs || !packagedArgs) - return; + if (!userArgs || !packagedArgs) + return; - // de-dup the args and comments in both files - set argMerger; - set comments; - string line; - while (getline(packagedArgs, line)) { - line = rtrim(line); - if (line[0] == '#') - comments.insert(line); - else if (line.size() > 0) - argMerger.insert(line); - } + // de-dup the args and comments in both files + set argMerger; + set comments; + string line; + while (getline(packagedArgs, line)) { + line = rtrim(line); + if (line[0] == '#') + comments.insert(line); + else if (line.size() > 0) + argMerger.insert(line); + } while (getline(userArgs, line)) { line = rtrim(line); if (line[0] == '#') @@ -93,17 +94,17 @@ void mergeMycnfIncludeArgs() else if (line.size() > 0) argMerger.insert(line); } - userArgs.close(); - packagedArgs.close(); + userArgs.close(); + packagedArgs.close(); - // write the merged version, comments first. They'll get ordered - // alphabetically but, meh. - packagedArgs.open(packagedArgsFilename.c_str(), ios::out | ios::trunc); - for (set::iterator it = comments.begin(); it != comments.end(); it++) - packagedArgs << *it << endl; - for (set::iterator it = argMerger.begin(); it != argMerger.end(); it++) - packagedArgs << *it << endl; - packagedArgs.close(); + // write the merged version, comments first. They'll get ordered + // alphabetically but, meh. + packagedArgs.open(packagedArgsFilename.c_str(), ios::out | ios::trunc); + for (set::iterator it = comments.begin(); it != comments.end(); it++) + packagedArgs << *it << endl; + for (set::iterator it = argMerger.begin(); it != argMerger.end(); it++) + packagedArgs << *it << endl; + packagedArgs.close(); } int main(int argc, char* argv[]) @@ -142,9 +143,9 @@ int main(int argc, char* argv[]) exit (1); } - // MCOL-1844. The user may have added options to their myCnf-include-args file. Merge - // myCnf-include-args.text with myCnf-include-args.text.rpmsave, save in myCnf-include-args.text - mergeMycnfIncludeArgs(); + // MCOL-1844. The user may have added options to their myCnf-include-args file. Merge + // myCnf-include-args.text with myCnf-include-args.text.rpmsave, save in myCnf-include-args.text + mergeMycnfIncludeArgs(); //include arguments file string includeFile = startup::StartUp::installDir() + "/bin/myCnf-include-args.text"; @@ -218,7 +219,7 @@ int main(int argc, char* argv[]) ofstream newFile (mycnfFile.c_str()); //create new file - int fd = open(mycnfFile.c_str(), O_RDWR | O_CREAT, 0666); + int fd = open(mycnfFile.c_str(), O_RDWR|O_CREAT, 0644); copy(lines.begin(), lines.end(), ostream_iterator(newFile, "\n")); newFile.close(); diff --git a/utils/funcexp/func_concat_ws.cpp b/utils/funcexp/func_concat_ws.cpp index 767544291..d5519fd4f 100644 --- a/utils/funcexp/func_concat_ws.cpp +++ b/utils/funcexp/func_concat_ws.cpp @@ -97,7 +97,7 @@ string Func_concat_ws::getStrVal(Row& row, string tmp; for ( uint32_t i = 1 ; i < parm.size() ; i++) { - string(stringValue(parm[i], row, isNull).c_str(), tmp); + stringValue(parm[i], row, isNull, tmp); str += tmp; if (isNull)