diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-23 23:02:48 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-23 23:02:48 +0200 |
| commit | 46cf1a0db3f20b97e17d4babf2d51a08a756219f (patch) | |
| tree | 1ce7d6bbda0143f2e00ed4951c8daad0f7502ca7 /storage/connect/tabjson.cpp | |
| parent | 3e36eb230b65d53acc8e02b00a024e72ed249425 (diff) | |
| download | mariadb-git-46cf1a0db3f20b97e17d4babf2d51a08a756219f.tar.gz | |
Fix bug: Discovery of JSON table fails in DEBUG mode
when NO MONGO support. (tdb->Uri is uninitialized)
modified: storage/connect/tabjson.cpp
Diffstat (limited to 'storage/connect/tabjson.cpp')
| -rw-r--r-- | storage/connect/tabjson.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp index 9950dfeda3e..98c9f080b48 100644 --- a/storage/connect/tabjson.cpp +++ b/storage/connect/tabjson.cpp @@ -131,14 +131,12 @@ PQRYRES JSONColumns(PGLOBAL g, char *db, char *dsn, PTOS topt, bool info) tdp->Base = GetIntegerTableOption(g, topt, "Base", 0) ? 1 : 0; tdp->Pretty = GetIntegerTableOption(g, topt, "Pretty", 2); tdp->Xcol = GetStringTableOption(g, topt, "Expand", NULL); + tdp->Uri = (dsn && *dsn ? dsn : NULL); if (trace) htrc("File %s objname=%s pretty=%d lvl=%d\n", tdp->Fn, tdp->Objname, tdp->Pretty, lvl); - if (dsn && *dsn) - tdp->Uri = dsn; - if (tdp->Uri) { #if defined(MONGO_SUPPORT) tdp->Collname = GetStringTableOption(g, topt, "Name", NULL); |