diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-01-09 20:52:17 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-01-09 20:52:17 +0100 |
| commit | 0891ae2fbb77c96a7fbeeb2ce9973d22da596f2a (patch) | |
| tree | 6af9062522d15d6b0ae0e930f8c8a32e41a847af /storage/connect/tabmysql.cpp | |
| parent | 6883e5c4c40d1411dcc7c43bbb7cbb3f2d0ab251 (diff) | |
| download | mariadb-git-0891ae2fbb77c96a7fbeeb2ce9973d22da596f2a.tar.gz | |
- Fix MDEV-9239. Meanwhile, make all references to the database in XTAB Schema
(was sometimes in XTAB Catalog)
modified: storage/connect/mycat.cc
modified: storage/connect/mycat.h
modified: storage/connect/reldef.cpp
modified: storage/connect/reldef.h
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabtbl.cpp
modified: storage/connect/tabutil.cpp
Diffstat (limited to 'storage/connect/tabmysql.cpp')
| -rw-r--r-- | storage/connect/tabmysql.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp index 658f3513b07..b9cede52a21 100644 --- a/storage/connect/tabmysql.cpp +++ b/storage/connect/tabmysql.cpp @@ -334,7 +334,7 @@ bool MYSQLDEF::DefineAM(PGLOBAL g, LPCSTR am, int) Delayed = !!GetIntCatInfo("Delayed", 0); } else { // MYSQL access from a PROXY table - Database = GetStringCatInfo(g, "Database", "*"); + Database = GetStringCatInfo(g, "Database", Schema ? Schema : "*"); Isview = GetBoolCatInfo("View", false); // We must get other connection parms from the calling table |