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

Merge branch 'develop-1.1' into 1.1-merge-up

Browse Source
This commit is contained in:
Andrew Hutchings
2017-12-12 20:26:00 +00:00
parent b795e6b781 ca2c511f59
commit 59d0a45da3
8 changed files with 146 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oamapps/mcsadmin/mcsadmin.cpp
View File

@@ -6836,6 +6836,8 @@ int processCommand(string* arguments)
cout << endl << "**** disableRep Failed : " << e.what() << endl;
}
cout << endl;
break;
}
@@ -7196,8 +7198,6 @@ int processCommand(string* arguments)
printModuleMemory(systemmemory.modulememory[i]);
}
cout << endl;
}
catch (exception& e)
{