diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-23 19:17:15 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-23 19:17:15 +0200 |
| commit | 74a46726227b5f34dedb28ff6d7a4d81b157d764 (patch) | |
| tree | 9c2d6fdebca4cf11ccb3b65c02a27633c1010212 /storage/connect/filamdbf.h | |
| parent | f930f4eda9dd849b48e67eaecc8c130bb9310107 (diff) | |
| download | mariadb-git-74a46726227b5f34dedb28ff6d7a4d81b157d764.tar.gz | |
- Move DataPath from the MYCAT catalog to the ha_connect handler. Indeed
it belongs to each tables and the catalog being share between several
instances of CONNECT, when a query implied several tables belonging to
different databases, some where pointing on the wrong database. This
fix bugs occuring in queries such as:
INSERT into db1.t1 select * from db2.t2;
Where the t1 data file was made in db2.
modified:
storage/connect/catalog.h
storage/connect/connect.cc
storage/connect/filamdbf.cpp
storage/connect/filamdbf.h
storage/connect/ha_connect.cc
storage/connect/ha_connect.h
storage/connect/mycat.cc
storage/connect/mycat.h
storage/connect/plgdbsem.h
storage/connect/plgdbutl.cpp
storage/connect/reldef.cpp
storage/connect/reldef.h
storage/connect/tabfix.h
storage/connect/tabfmt.cpp
storage/connect/tabfmt.h
storage/connect/tabmul.cpp
Diffstat (limited to 'storage/connect/filamdbf.h')
| -rw-r--r-- | storage/connect/filamdbf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/filamdbf.h b/storage/connect/filamdbf.h index 9be8bfd980d..49bf5f0db93 100644 --- a/storage/connect/filamdbf.h +++ b/storage/connect/filamdbf.h @@ -1,7 +1,7 @@ /***************** FilAmDbf H Declares Source Code File (.H) ****************/ -/* Name: filamdbf.h Version 1.3 */ +/* Name: filamdbf.h Version 1.4 */ /* */ -/* (C) Copyright to the author Olivier BERTRAND 2005-2012 */ +/* (C) Copyright to the author Olivier BERTRAND 2005-2014 */ /* */ /* This file contains the DBF file access method classes declares. */ /****************************************************************************/ @@ -19,7 +19,7 @@ typedef class DBMFAM *PDBMFAM; /****************************************************************************/ /* Functions used externally. */ /****************************************************************************/ -PQRYRES DBFColumns(PGLOBAL g, const char *fn, BOOL info); +PQRYRES DBFColumns(PGLOBAL g, char *dp, const char *fn, BOOL info); /****************************************************************************/ /* This is the base class for dBASE file access methods. */ |