1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Reformat all code to coding standard

This commit is contained in:
Andrew Hutchings
2017-10-26 17:18:17 +01:00
parent 4985f3456e
commit 01446d1e22
1296 changed files with 403852 additions and 353747 deletions

View File

@ -37,34 +37,38 @@ namespace startup
/* static */
mutex StartUp::fInstallDirLock;
/* static */
string* StartUp::fInstallDirp=0;
string* StartUp::fInstallDirp = 0;
/* static */
const string StartUp::installDir()
{
mutex::scoped_lock lk(fInstallDirLock);
mutex::scoped_lock lk(fInstallDirLock);
if (fInstallDirp)
return *fInstallDirp;
if (fInstallDirp)
return *fInstallDirp;
#ifdef _MSC_VER
fInstallDirp = new string("C:\\Calpont");
string cfStr = IDBreadRegistry("");
if (!cfStr.empty())
*fInstallDirp = cfStr;
fInstallDirp = new string("C:\\Calpont");
string cfStr = IDBreadRegistry("");
if (!cfStr.empty())
*fInstallDirp = cfStr;
#else
fInstallDirp = new string("/usr/local/mariadb/columnstore");
//See if we can figure out the install dir in Linux...
//1. env var COLUMNSTORE_INSTALL_DIR
const char* p=0;
p = getenv("COLUMNSTORE_INSTALL_DIR");
if (p && *p)
*fInstallDirp = p;
//2. up one level from current binary location?
//3. fall back to /usr/local/mariadb/columnstore
fInstallDirp = new string("/usr/local/mariadb/columnstore");
//See if we can figure out the install dir in Linux...
//1. env var COLUMNSTORE_INSTALL_DIR
const char* p = 0;
p = getenv("COLUMNSTORE_INSTALL_DIR");
if (p && *p)
*fInstallDirp = p;
//2. up one level from current binary location?
//3. fall back to /usr/local/mariadb/columnstore
#endif
return *fInstallDirp;
return *fInstallDirp;
}
}