summaryrefslogtreecommitdiff
path: root/storage/connect/tabjson.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2015-02-25 11:59:00 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2015-02-25 11:59:00 +0100
commitaa107ef3ab47c9bfbd177672e64d2af56ce1b1b5 (patch)
treeedc0901c1d2e61b13c747f7251af9b4f67132b4f /storage/connect/tabjson.h
parente027f5e8d5d966f11d7f38825a8e316ff9d4dd79 (diff)
downloadmariadb-git-aa107ef3ab47c9bfbd177672e64d2af56ce1b1b5.tar.gz
- FIX assert failure when sorting JSON tables
modified: storage/connect/tabjson.cpp storage/connect/tabjson.h
Diffstat (limited to 'storage/connect/tabjson.h')
-rw-r--r--storage/connect/tabjson.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h
index f46a59c5498..eb9d078012b 100644
--- a/storage/connect/tabjson.h
+++ b/storage/connect/tabjson.h
@@ -94,7 +94,7 @@ class TDBJSN : public TDBDOS {
JMODE Jmode; // MODE_OBJECT by default
char *Xcol; // Name of expandable column
int Fpos; // The current row index
- int Spos; // DELETE start index
+//int Spos; // DELETE start index
int N; // The current Rownum
int Limit; // Limit of multiple values
int Pretty; // Depends on file structure
@@ -175,6 +175,9 @@ class TDBJSON : public TDBJSN {
virtual int GetMaxSize(PGLOBAL g);
virtual void ResetSize(void);
virtual int GetRecpos(void) {return Fpos;}
+ virtual int GetProgCur(void) {return N;}
+ virtual bool SetRecpos(PGLOBAL g, int recpos)
+ {Fpos = recpos - 1; return false;}
virtual bool OpenDB(PGLOBAL g);
virtual int ReadDB(PGLOBAL g);
virtual bool PrepareWriting(PGLOBAL g) {return false;}