diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-03-31 01:14:00 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-03-31 01:14:00 +0300 |
| commit | 5210c69e71ddcf39ca14194504e45baa4d325610 (patch) | |
| tree | 846e5597b87730f756d2883af273ff90dc7fdb5d /storage/connect/tabfmt.h | |
| parent | c29336f2b0c99d39979609374b8673573475696f (diff) | |
| parent | a0c79bcf0062adc2489f0b0bed98b05d4db8f476 (diff) | |
| download | mariadb-git-5210c69e71ddcf39ca14194504e45baa4d325610.tar.gz | |
Merge 10.2 into bb-10.2-mariarocks
Diffstat (limited to 'storage/connect/tabfmt.h')
| -rw-r--r-- | storage/connect/tabfmt.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/connect/tabfmt.h b/storage/connect/tabfmt.h index 5ce8d399a64..e5655435be7 100644 --- a/storage/connect/tabfmt.h +++ b/storage/connect/tabfmt.h @@ -52,6 +52,7 @@ public: /***********************************************************************/ class DllExport TDBCSV : public TDBDOS { friend class CSVCOL; + friend class MAPFAM; friend PQRYRES CSVColumns(PGLOBAL, char *, PTOS, bool); public: // Constructor @@ -64,7 +65,7 @@ public: {return (PTDB)new(g) TDBCSV(g, this);} // Methods - virtual PTDB CopyOne(PTABS t); + virtual PTDB Clone(PTABS t); //virtual bool IsUsingTemp(PGLOBAL g); virtual int GetBadLines(void) {return (int)Nerr;} @@ -147,7 +148,7 @@ class DllExport TDBFMT : public TDBCSV { {return (PTDB)new(g) TDBFMT(g, this);} // Methods - virtual PTDB CopyOne(PTABS t); + virtual PTDB Clone(PTABS t); // Database routines virtual PCOL MakeCol(PGLOBAL g, PCOLDEF cdp, PCOL cprec, int n); |