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

merge mcol59 to develop

This commit is contained in:
david hill
2016-06-24 15:49:49 -05:00
117 changed files with 1959 additions and 619 deletions

View File

@ -2325,7 +2325,7 @@ int ha_calpont_impl_rnd_init(TABLE* table)
if (!getenv("CALPONT_CONFIG_FILE"))
{
string calpontConfigFile(home + "/Calpont/etc/Calpont.xml");
string calpontConfigFile(home + "/Calpont/etc/Columnstore.xml");
setenv("CALPONT_CONFIG_FILE", calpontConfigFile.c_str(), 1);
}