diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-04 14:49:31 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-04 14:49:31 +0300 |
| commit | a8a925dd22ae00494cc9ffdc1ff68906106a408c (patch) | |
| tree | a857c565a22ec7f6f41d3efa72053a726a346af2 /storage/connect/jmgoconn.cpp | |
| parent | 2820f30dde3148df71e1d748ac705d98d60e0787 (diff) | |
| parent | 72fa9dabadb4b0011f483ccbf1ef59e62d0ef1e0 (diff) | |
| download | mariadb-git-a8a925dd22ae00494cc9ffdc1ff68906106a408c.tar.gz | |
Merge branch bb-10.2-release into bb-10.3-release
Diffstat (limited to 'storage/connect/jmgoconn.cpp')
| -rw-r--r-- | storage/connect/jmgoconn.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/connect/jmgoconn.cpp b/storage/connect/jmgoconn.cpp index 8a12fffbd05..0af91bc78cd 100644 --- a/storage/connect/jmgoconn.cpp +++ b/storage/connect/jmgoconn.cpp @@ -121,20 +121,21 @@ JMgoConn::JMgoConn(PGLOBAL g, PCSZ collname, PCSZ wrapper) /***********************************************************************/ void JMgoConn::AddJars(PSTRG jpop, char sep) { -#if defined(BSON_SUPPORT) +#if defined(DEVELOPMENT) if (m_Version == 2) { jpop->Append(sep); // jpop->Append("C:/Eclipse/workspace/MongoWrap2/bin"); - jpop->Append(sep); +// jpop->Append(sep); jpop->Append("C:/mongo-java-driver/mongo-java-driver-2.13.3.jar"); } else { jpop->Append(sep); // jpop->Append("C:/Eclipse/workspace/MongoWrap3/bin"); +// jpop->Append(sep); // jpop->Append("C:/Program Files/MariaDB 10.1/lib/plugin/JavaWrappers.jar"); - jpop->Append(sep); +// jpop->Append(sep); jpop->Append("C:/mongo-java-driver/mongo-java-driver-3.4.2.jar"); } // endif m_Version -#endif // BSON_SUPPORT +#endif // DEVELOPMENT } // end of AddJars /***********************************************************************/ |