hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Marko
2018-06-07 14:39:16 +03:00
parent 2481de260f 0dd7448586
commit 880db1353a
4 changed files with 76 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/filter/cache/test/testkeygeneration.cc vendored
View File

@ -125,7 +125,7 @@ int test(StorageFactory& factory, istream& in)
int main(int argc, char* argv[])
{
int rv = EXIT_FAILURE;
StorageFactory* pFactory;
if ((argc == 2) || (argc == 3))
{
char* libdir = MXS_STRDUP("../../../../../query_classifier/qc_sqlite/");
@ -139,7 +139,7 @@ int main(int argc, char* argv[])
libdir = MXS_STRDUP("../storage/storage_inmemory/");
set_libdir(libdir);
StorageFactory* pFactory = StorageFactory::Open(zModule);
pFactory = StorageFactory::Open(zModule);
if (pFactory)
{
@ -182,6 +182,7 @@ int main(int argc, char* argv[])
// TODO: Remove this once globally allocated memory is freed
MXS_FREE(libdir);
delete pFactory;
}
else
{