diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2021-07-31 11:20:09 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2021-07-31 11:20:09 +0200 |
| commit | 46fed496b6634248b37fbf2b80a6333aa3659873 (patch) | |
| tree | 40adf820311c5cfb51dcd5a48d37a29feef1790a | |
| parent | 1d468ee0401576e5646cef5d4e4ced9dc5a51a2b (diff) | |
| download | mariadb-git-46fed496b6634248b37fbf2b80a6333aa3659873.tar.gz | |
Fix bson crash and mongo test
| -rw-r--r-- | storage/connect/mysql-test/connect/t/mongo.inc | 12 | ||||
| -rw-r--r-- | storage/connect/tabbson.cpp | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/storage/connect/mysql-test/connect/t/mongo.inc b/storage/connect/mysql-test/connect/t/mongo.inc index fab2ca84139..25c3f207696 100644 --- a/storage/connect/mysql-test/connect/t/mongo.inc +++ b/storage/connect/mysql-test/connect/t/mongo.inc @@ -1,3 +1,11 @@ -let $MONGO= C:/Applic/MongoDB/Server/3.6/bin/mongo; -let $MONGOIMPORT= C:/Applic/MongoDB/Server/3.6/bin/mongoimport; +#let $MONGO= C:/Applic/MongoDB/Server/3.6/bin/mongo; +#let $MONGOIMPORT= C:/Applic/MongoDB/Server/3.6/bin/mongoimport; +let $MONGO= mongo; +let $MONGOIMPORT= mongoimport; + + + + + + diff --git a/storage/connect/tabbson.cpp b/storage/connect/tabbson.cpp index e372dd662cf..2df84e852eb 100644 --- a/storage/connect/tabbson.cpp +++ b/storage/connect/tabbson.cpp @@ -2422,6 +2422,7 @@ void TDBBSON::ResetSize(void) MaxSize = Cardinal = -1; Fpos = -1; N = 0; + Docrow = NULL; Done = false; } // end of ResetSize @@ -2480,6 +2481,7 @@ bool TDBBSON::SetRecpos(PGLOBAL, int recpos) #endif // 0 Fpos = recpos - 1; + Docrow = NULL; return false; } // end of SetRecpos @@ -2495,6 +2497,7 @@ bool TDBBSON::OpenDB(PGLOBAL g) Fpos = -1; NextSame = false; SameRow = 0; + Docrow = NULL; return false; } // endif use |