diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2020-12-04 23:21:59 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2020-12-04 23:21:59 +0100 |
| commit | c05b1288fd86c98d9b13724d6b115b35c77ca15a (patch) | |
| tree | cfddcd8caf3498ffbc93da831c65b94f1bcfd95d /storage/connect/tabbson.h | |
| parent | 4b6d661c7f4bcf9f0f5a9f5d5f4a6743983fc9a5 (diff) | |
| download | mariadb-git-c05b1288fd86c98d9b13724d6b115b35c77ca15a.tar.gz | |
Remove a push warning causing failing assert. Modified storage/connect/filamap.cpp
Diffstat (limited to 'storage/connect/tabbson.h')
| -rw-r--r-- | storage/connect/tabbson.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/storage/connect/tabbson.h b/storage/connect/tabbson.h index 127370ce342..677bcbfd6e9 100644 --- a/storage/connect/tabbson.h +++ b/storage/connect/tabbson.h @@ -134,7 +134,7 @@ public: PVAL MakeBson(PGLOBAL g, PBVAL jsp); PVAL GetColumnValue(PGLOBAL g, PBVAL row, int i); PVAL ExpandArray(PGLOBAL g, PBVAL arp, int n); - PVAL CalculateArray(PBVAL arp, int n); + PVAL CalculateArray(PGLOBAL g, PBVAL arp, int n); PBVAL GetRow(PGLOBAL g); protected: @@ -243,7 +243,7 @@ public: // Methods virtual bool SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check); - bool ParseJpath(PGLOBAL g); + bool ParseJpath(PGLOBAL g); virtual PSZ GetJpath(PGLOBAL g, bool proj); virtual void ReadColumn(PGLOBAL g); virtual void WriteColumn(PGLOBAL g); @@ -251,12 +251,6 @@ public: protected: bool CheckExpand(PGLOBAL g, int i, PSZ nm, bool b); bool SetArrayOptions(PGLOBAL g, char* p, int i, PSZ nm); -//PVAL GetColumnValue(PGLOBAL g, PBVAL row, int i); -//PVAL ExpandArray(PGLOBAL g, PBVAL arp, int n); -//PVAL CalculateArray(PGLOBAL g, PBVAL arp, int n); - PVAL MakeBson(PGLOBAL g, PBVAL jsp); -//void SetJsonValue(PGLOBAL g, PVAL vp, PBVAL val); -//PBVAL GetRow(PGLOBAL g); // Default constructor not to be used BSONCOL(void) {} |