1 |
wally |
1419764 |
diff -uNr mysql-connector-c++-1.1.9.org/driver/mysql_connection.cpp mysql-connector-c++-1.1.9/driver/mysql_connection.cpp |
2 |
|
|
--- mysql-connector-c++-1.1.9.org/driver/mysql_connection.cpp 2017-05-10 19:14:59.000000000 +0300 |
3 |
|
|
+++ mysql-connector-c++-1.1.9/driver/mysql_connection.cpp 2018-02-05 11:50:27.376483448 +0200 |
4 |
|
|
@@ -231,7 +231,7 @@ |
5 |
|
|
{"OPT_REPORT_DATA_TRUNCATION", MYSQL_REPORT_DATA_TRUNCATION, false}, |
6 |
|
|
{"OPT_ENABLE_CLEARTEXT_PLUGIN", MYSQL_ENABLE_CLEARTEXT_PLUGIN, false}, |
7 |
|
|
{"sslVerify", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, false}, // Deprecated |
8 |
|
|
- {"OPT_CAN_HANDLE_EXPIRED_PASSWORDS", MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true}, |
9 |
|
|
+// {"OPT_CAN_HANDLE_EXPIRED_PASSWORDS", MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, true}, |
10 |
|
|
{"OPT_CONNECT_ATTR_RESET", MYSQL_OPT_CONNECT_ATTR_RESET, true}, |
11 |
|
|
{"OPT_RECONNECT", MYSQL_OPT_RECONNECT, true}, |
12 |
|
|
{"sslEnforce", MYSQL_OPT_SSL_ENFORCE, false} // Deprecated |
13 |
|
|
@@ -246,7 +246,8 @@ |
14 |
|
|
{"OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, false}, |
15 |
|
|
{"OPT_MAX_ALLOWED_PACKET", MYSQL_OPT_MAX_ALLOWED_PACKET, false}, |
16 |
|
|
{"OPT_NET_BUFFER_LENGTH", MYSQL_OPT_NET_BUFFER_LENGTH, false}, |
17 |
|
|
- {"OPT_SSL_MODE", MYSQL_OPT_SSL_MODE , false}, |
18 |
|
|
+ {"OPT_SSL_ENFORCE", MYSQL_OPT_SSL_ENFORCE, false}, |
19 |
|
|
+// {"OPT_SSL_MODE", MYSQL_OPT_SSL_MODE , false}, |
20 |
|
|
|
21 |
|
|
}; |
22 |
|
|
/* Array for mapping of string connection options to mysql_options call */ |
23 |
|
|
@@ -268,7 +269,7 @@ |
24 |
|
|
{"readDefaultGroup", MYSQL_READ_DEFAULT_GROUP, false}, |
25 |
|
|
{"readDefaultFile", MYSQL_READ_DEFAULT_FILE, false}, |
26 |
|
|
{"OPT_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, true}, |
27 |
|
|
- {"OPT_TLS_VERSION", MYSQL_OPT_TLS_VERSION, false}, |
28 |
|
|
+// {"OPT_TLS_VERSION", MYSQL_OPT_TLS_VERSION, false}, |
29 |
|
|
}; |
30 |
|
|
|
31 |
|
|
template<class T> |
32 |
|
|
diff -uNr mysql-connector-c++-1.1.9.org/driver/mysql_connection_options.h mysql-connector-c++-1.1.9/driver/mysql_connection_options.h |
33 |
|
|
--- mysql-connector-c++-1.1.9.org/driver/mysql_connection_options.h 2017-05-10 19:14:59.000000000 +0300 |
34 |
|
|
+++ mysql-connector-c++-1.1.9/driver/mysql_connection_options.h 2018-02-05 12:38:10.760832179 +0200 |
35 |
|
|
@@ -55,8 +55,8 @@ |
36 |
|
|
MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, |
37 |
|
|
MYSQL_OPT_SSL_ENFORCE, |
38 |
|
|
MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH, |
39 |
|
|
- MYSQL_OPT_TLS_VERSION, |
40 |
|
|
- MYSQL_OPT_SSL_MODE |
41 |
|
|
+ //MYSQL_OPT_TLS_VERSION, |
42 |
|
|
+ //MYSQL_OPT_SSL_MODE |
43 |
|
|
}; |
44 |
|
|
|
45 |
|
|
} |
46 |
|
|
|