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/reldef.h | |
| 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/reldef.h')
| -rw-r--r-- | storage/connect/reldef.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/storage/connect/reldef.h b/storage/connect/reldef.h index dada5716dbe..bc1bd2ddd74 100644 --- a/storage/connect/reldef.h +++ b/storage/connect/reldef.h @@ -1,7 +1,7 @@ /*************** RelDef H Declares Source Code File (.H) ***************/ -/* Name: RELDEF.H Version 1.5 */ +/* Name: RELDEF.H Version 1.6 */ /* */ -/* (C) Copyright to the author Olivier BERTRAND 2004-2015 */ +/* (C) Copyright to the author Olivier BERTRAND 2004-2016 */ /* */ /* This file contains the DEF classes definitions. */ /***********************************************************************/ @@ -50,7 +50,8 @@ class DllExport RELDEF : public BLOCK { // Relation definition block int GetCharCatInfo(PSZ what, PSZ sdef, char *buf, int size); char *GetStringCatInfo(PGLOBAL g, PSZ what, PSZ sdef); virtual int Indexable(void) {return 0;} - virtual bool Define(PGLOBAL g, PCATLG cat, LPCSTR name, LPCSTR am) = 0; + virtual bool Define(PGLOBAL g, PCATLG cat, + LPCSTR name, LPCSTR schema, LPCSTR am) = 0; virtual PTDB GetTable(PGLOBAL g, MODE mode) = 0; protected: @@ -97,8 +98,9 @@ class DllExport TABDEF : public RELDEF { /* Logical table descriptor */ int GetColCatInfo(PGLOBAL g); void SetIndexInfo(void); bool DropTable(PGLOBAL g, PSZ name); - virtual bool Define(PGLOBAL g, PCATLG cat, LPCSTR name, LPCSTR am); - virtual bool DefineAM(PGLOBAL, LPCSTR, int) = 0; + virtual bool Define(PGLOBAL g, PCATLG cat, + LPCSTR name, LPCSTR schema, LPCSTR am); + virtual bool DefineAM(PGLOBAL, LPCSTR, int) = 0; protected: // Members |