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

Merge branch 'develop-1.1' into 1.1-merge-up-2018-11-23

Browse Source
This commit is contained in:
Andrew Hutchings
2018-11-23 11:45:17 +00:00
parent 105f0ed4ad f6cf90fee7
commit 1834b64de8
3 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oam/install_scripts/columnstoreAlias
View File

@ -4,7 +4,7 @@ alias mcsmysql='/usr/local/mariadb/columnstore/mysql/bin/mysql --defaults-extra-
alias ma=/usr/local/mariadb/columnstore/bin/mcsadmin alias ma=/usr/local/mariadb/columnstore/bin/mcsadmin
alias mcsadmin=/usr/local/mariadb/columnstore/bin/mcsadmin alias mcsadmin=/usr/local/mariadb/columnstore/bin/mcsadmin
alias cpimport=/usr/local/mariadb/columnstore/bin/cpimport 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 log='cd /var/log/mariadb/columnstore/'
alias core='cd /var/log/mariadb/columnstore/corefiles' alias core='cd /var/log/mariadb/columnstore/corefiles'
alias tmsg='tail -f /var/log/messages' 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 twarning='tail -f /var/log/mariadb/columnstore/warning.log'
alias tcrit='tail -f /var/log/mariadb/columnstore/crit.log' alias tcrit='tail -f /var/log/mariadb/columnstore/crit.log'
alias dbrm='cd /usr/local/mariadb/columnstore/data1/systemFiles/dbrm' 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'

3
oamapps/postConfigure/mycnfUpgrade.cpp
View File

@ -54,6 +54,7 @@
using namespace std; using namespace std;
using namespace oam; 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 * myCnf-include-args.text file. Merge it with the packaged version, and then process as we
* have before. * have before.
@ -218,7 +219,7 @@ int main(int argc, char* argv[])
ofstream newFile (mycnfFile.c_str()); ofstream newFile (mycnfFile.c_str());
//create new file //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<string>(newFile, "\n")); copy(lines.begin(), lines.end(), ostream_iterator<string>(newFile, "\n"));
newFile.close(); newFile.close();

2
utils/funcexp/func_concat_ws.cpp
View File

@ -97,7 +97,7 @@ string Func_concat_ws::getStrVal(Row& row,
string tmp; string tmp;
for ( uint32_t i = 1 ; i < parm.size() ; i++) 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; str += tmp;
if (isNull) if (isNull)