summaryrefslogtreecommitdiff
path: root/storage/connect/valblk.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2014-05-02 15:55:45 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2014-05-02 15:55:45 +0200
commitcdbb79583778827e7ceb90f3e9230062327e0b09 (patch)
tree1684a22d140413412e43cf7d8564645c2fbc071f /storage/connect/valblk.h
parent006dfe52822ee3550a42a9338ad29aca012945f4 (diff)
downloadmariadb-git-cdbb79583778827e7ceb90f3e9230062327e0b09.tar.gz
- Adding fetched columns to Dynamic index key (unique only)
Fix two bugs concerning added KXYCOL's: 1 - Not set during reading 2 - Val_K not set in FastFind modified: storage/connect/connect.cc storage/connect/filamtxt.h storage/connect/tabdos.cpp storage/connect/tabfix.cpp storage/connect/table.cpp storage/connect/valblk.h storage/connect/xindex.cpp storage/connect/xindex.h storage/connect/xtable.h
Diffstat (limited to 'storage/connect/valblk.h')
-rw-r--r--storage/connect/valblk.h60
1 files changed, 30 insertions, 30 deletions
diff --git a/storage/connect/valblk.h b/storage/connect/valblk.h
index 3ff34c4bcdf..67d1c5a27ee 100644
--- a/storage/connect/valblk.h
+++ b/storage/connect/valblk.h
@@ -22,36 +22,36 @@ DllExport PVBLK AllocValBlock(PGLOBAL, void*, int, int, int, int,
bool, bool, bool);
const char *GetFmt(int type, bool un = false);
-/***********************************************************************/
-/* DB static external variables. */
-/***********************************************************************/
-extern MBLOCK Nmblk; /* Used to initialize MBLOCK's */
-
-/***********************************************************************/
-/* Class MBVALS is a utility class for (re)allocating VALBLK's. */
-/***********************************************************************/
-class MBVALS : public BLOCK {
-//friend class LSTBLK;
- friend class ARRAY;
- public:
- // Constructors
- MBVALS(void) {Vblk = NULL; Mblk = Nmblk;}
-
- // Methods
- void *GetMemp(void) {return Mblk.Memp;}
- PVBLK Allocate(PGLOBAL g, int type, int len, int prec,
- int n, bool sub = FALSE);
- bool ReAllocate(PGLOBAL g, int n);
- void Free(void);
-
- protected:
- // Members
- PVBLK Vblk; // Pointer to VALBLK
- MBLOCK Mblk; // The memory block
- }; // end of class MBVALS
-
-typedef class MBVALS *PMBV;
-
+/***********************************************************************/
+/* DB static external variables. */
+/***********************************************************************/
+extern MBLOCK Nmblk; /* Used to initialize MBLOCK's */
+
+/***********************************************************************/
+/* Class MBVALS is a utility class for (re)allocating VALBLK's. */
+/***********************************************************************/
+class MBVALS : public BLOCK {
+//friend class LSTBLK;
+ friend class ARRAY;
+ public:
+ // Constructors
+ MBVALS(void) {Vblk = NULL; Mblk = Nmblk;}
+
+ // Methods
+ void *GetMemp(void) {return Mblk.Memp;}
+ PVBLK Allocate(PGLOBAL g, int type, int len, int prec,
+ int n, bool sub = FALSE);
+ bool ReAllocate(PGLOBAL g, int n);
+ void Free(void);
+
+ protected:
+ // Members
+ PVBLK Vblk; // Pointer to VALBLK
+ MBLOCK Mblk; // The memory block
+ }; // end of class MBVALS
+
+typedef class MBVALS *PMBV;
+
/***********************************************************************/
/* Class VALBLK represent a base class for variable blocks. */
/***********************************************************************/