diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /storage/connect/myconn.cpp | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'storage/connect/myconn.cpp')
| -rw-r--r-- | storage/connect/myconn.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp index bb6f72de..addcb0f6 100644 --- a/storage/connect/myconn.cpp +++ b/storage/connect/myconn.cpp @@ -480,6 +480,7 @@ int MYSQLC::Open(PGLOBAL g, const char *host, const char *db, const char *pipe = NULL; //uint cto = 10, nrt = 20; my_bool my_true= 1; + my_bool my_false= 0; m_DB = mysql_init(NULL); @@ -528,8 +529,8 @@ int MYSQLC::Open(PGLOBAL g, const char *host, const char *db, mysql_options(m_DB, MYSQL_SET_CHARSET_NAME, csname); // Don't know what this one do but FEDERATED does it - mysql_options(m_DB, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY, - (char*)&my_true); + mysql_options(m_DB, MYSQL_OPT_USE_THREAD_SPECIFIC_MEMORY, &my_true); + mysql_options(m_DB, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &my_false); if (!mysql_real_connect(m_DB, host, user, pwd, db, pt, pipe, CLIENT_MULTI_RESULTS | CLIENT_REMEMBER_OPTIONS)) { |