summaryrefslogtreecommitdiff
path: root/storage/connect/tabmul.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2017-02-16 18:01:48 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2017-02-16 18:01:48 +0100
commit6f34d8807c5343dfa07949ce95a1ad92c2972756 (patch)
tree5308fbf7a5873cc52f8b047c12ceed3a5d0bfa48 /storage/connect/tabmul.h
parent82913b0e909a3b8f10138f7f7cc759301f4c2026 (diff)
downloadmariadb-git-6f34d8807c5343dfa07949ce95a1ad92c2972756.tar.gz
All changes made on 10.1
Diffstat (limited to 'storage/connect/tabmul.h')
-rw-r--r--storage/connect/tabmul.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/connect/tabmul.h b/storage/connect/tabmul.h
index 433cc3a2ee3..90c8b9037f2 100644
--- a/storage/connect/tabmul.h
+++ b/storage/connect/tabmul.h
@@ -1,7 +1,7 @@
/*************** Tabmul H Declares Source Code File (.H) ***************/
-/* Name: TABMUL.H Version 1.4 */
+/* Name: TABMUL.H Version 1.5 */
/* */
-/* (C) Copyright to PlugDB Software Development 2003-2012 */
+/* (C) Copyright to PlugDB Software Development 2003-2017 */
/* Author: Olivier BERTRAND */
/* */
/* This file contains the TDBMUL and TDBDIR classes declares. */
@@ -28,7 +28,7 @@ class DllExport TDBMUL : public TDBASE {
//friend class MULCOL;
public:
// Constructor
- TDBMUL(PTDBASE tdbp);
+ TDBMUL(PTDB tdbp);
TDBMUL(PTDBMUL tdbp);
// Implementation
@@ -37,7 +37,7 @@ class DllExport TDBMUL : public TDBASE {
// Methods
virtual void ResetDB(void);
- virtual PTDB CopyOne(PTABS t);
+ virtual PTDB Clone(PTABS t);
virtual bool IsSame(PTDB tp) {return tp == (PTDB)Tdbp;}
virtual PSZ GetFile(PGLOBAL g) {return Tdbp->GetFile(g);}
virtual int GetRecpos(void) {return 0;}
@@ -61,7 +61,7 @@ class DllExport TDBMUL : public TDBASE {
protected:
// Members
- TDBASE *Tdbp; // Points to a (file) table class
+ PTDB Tdbp; // Points to a (file) table class
char* *Filenames; // Points to file names
int Rows; // Total rows of already read files
int Mul; // Type of multiple file list
@@ -112,7 +112,7 @@ class TDBDIR : public TDBASE {
{return (PTDB)new(g) TDBDIR(this);}
// Methods
- virtual PTDB CopyOne(PTABS t);
+ virtual PTDB Clone(PTABS t);
virtual int GetRecpos(void) {return iFile;}
// Database routines
@@ -168,7 +168,7 @@ class TDBSDR : public TDBDIR {
{return (PTDB)new(g) TDBSDR(this);}
// Methods
- virtual PTDB CopyOne(PTABS t);
+ virtual PTDB Clone(PTABS t);
// Database routines
virtual int GetMaxSize(PGLOBAL g);