diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2021-01-08 22:18:52 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2021-01-08 22:18:52 +0100 |
| commit | 8f34d45404817a4fe63251ac2ab74da96b6849fa (patch) | |
| tree | 6fe27ab74b650a0fcc409fbfbc08218f921fc00c /storage/connect/plugutil.cpp | |
| parent | cba46c9912b2bcd062ecc6b53082ba5eb5109e41 (diff) | |
| download | mariadb-git-8f34d45404817a4fe63251ac2ab74da96b6849fa.tar.gz | |
- Add the new BSON temporary type for testing
modified: storage/connect/CMakeLists.txt
modified: storage/connect/bson.cpp
modified: storage/connect/bson.h
modified: storage/connect/bsonudf.cpp
modified: storage/connect/bsonudf.h
modified: storage/connect/global.h
modified: storage/connect/json.cpp
modified: storage/connect/jsonudf.cpp
modified: storage/connect/mysql-test/connect/disabled.def
modified: storage/connect/mysql-test/connect/t/mongo_test.inc
modified: storage/connect/plugutil.cpp
modified: storage/connect/tabbson.cpp
modified: storage/connect/tabjson.cpp
Diffstat (limited to 'storage/connect/plugutil.cpp')
| -rw-r--r-- | storage/connect/plugutil.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/connect/plugutil.cpp b/storage/connect/plugutil.cpp index c33639bf744..69d258d9fd3 100644 --- a/storage/connect/plugutil.cpp +++ b/storage/connect/plugutil.cpp @@ -474,8 +474,10 @@ bool AllocSarea(PGLOBAL g, size_t size) if (!g->Sarea) { sprintf(g->Message, MSG(MALLOC_ERROR), "malloc"); g->Sarea_Size = 0; - } else - g->Sarea_Size = size; + } else { + g->Sarea_Size = size; + PlugSubSet(g->Sarea, size); + } // endif Sarea #if defined(DEVELOPMENT) if (true) { @@ -484,7 +486,6 @@ bool AllocSarea(PGLOBAL g, size_t size) #endif if (g->Sarea) { htrc("Work area of %zd allocated at %p\n", size, g->Sarea); - PlugSubSet(g->Sarea, size); } else htrc("SareaAlloc: %s\n", g->Message); @@ -624,7 +625,7 @@ size_t MakeOff(void* memp, void* ptr) #if defined(_DEBUG) || defined(DEVELOPMENT) if (ptr <= memp) { fprintf(stderr, "ptr %p <= memp %p", ptr, memp); - throw 999; + DoThrow(999); } // endif ptr #endif // _DEBUG || DEVELOPMENT return (size_t)((char*)ptr - (size_t)memp); @@ -633,4 +634,4 @@ size_t MakeOff(void* memp, void* ptr) } /* end of MakeOff */ - /*--------------------- End of PLUGUTIL program -----------------------*/ +/*---------------------- End of PLUGUTIL program ------------------------*/ |