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/tabfmt.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/tabfmt.h')
-rw-r--r-- | storage/connect/tabfmt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/tabfmt.h b/storage/connect/tabfmt.h index 939c1677f93..1b39a47e7d9 100644 --- a/storage/connect/tabfmt.h +++ b/storage/connect/tabfmt.h @@ -13,8 +13,8 @@ typedef class TDBFMT *PTDBFMT; /***********************************************************************/ /* Functions used externally. */ /***********************************************************************/ -PQRYRES CSVColumns(PGLOBAL g, const char *fn, char sep, char q, - int hdr, int mxr, bool info); +PQRYRES CSVColumns(PGLOBAL g, char *dp, const char *fn, char sep, + char q, int hdr, int mxr, bool info); /***********************************************************************/ /* CSV table. */ |