Excluded options only available at MySql >= 5.7

Author: marcobusemann

driver/mysql_connection.cpp

@@ -258,8 +258,10 @@ static const String2IntMap intOptions[]=
     {"OPT_READ_TIMEOUT",        MYSQL_OPT_READ_TIMEOUT, false},
     {"OPT_WRITE_TIMEOUT",       MYSQL_OPT_WRITE_TIMEOUT, false},
     {"OPT_LOCAL_INFILE",        MYSQL_OPT_LOCAL_INFILE, false},
+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
     {"OPT_MAX_ALLOWED_PACKET",  MYSQL_OPT_MAX_ALLOWED_PACKET, false},
     {"OPT_NET_BUFFER_LENGTH",   MYSQL_OPT_NET_BUFFER_LENGTH, false},
+#endif
     {"OPT_SSL_MODE",            MYSQL_OPT_SSL_MODE    , false},
 #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
     {"OPT_RETRY_COUNT",         MYSQL_OPT_RETRY_COUNT, false},
@@ -284,7 +286,9 @@ static const String2IntMap stringOptions[]=
     {"readDefaultGroup", MYSQL_READ_DEFAULT_GROUP, false},
     {"readDefaultFile",  MYSQL_READ_DEFAULT_FILE, false},
     {"OPT_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, true},
+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
     {"OPT_TLS_VERSION",  MYSQL_OPT_TLS_VERSION, false},
+#endif
   };
 
 template<class T>

driver/nativeapi/mysql_native_connection_wrapper.cpp

@@ -93,10 +93,12 @@ get_mysql_option(sql::mysql::MySQL_Connection_Options opt)
   case sql::mysql::MYSQL_SERVER_PUBLIC_KEY: return ::MYSQL_SERVER_PUBLIC_KEY;
   case sql::mysql::MYSQL_ENABLE_CLEARTEXT_PLUGIN: return ::MYSQL_ENABLE_CLEARTEXT_PLUGIN;
   case sql::mysql::MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: return ::MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS;
+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
   case sql::mysql::MYSQL_OPT_MAX_ALLOWED_PACKET: return ::MYSQL_OPT_MAX_ALLOWED_PACKET;
   case sql::mysql::MYSQL_OPT_NET_BUFFER_LENGTH: return ::MYSQL_OPT_NET_BUFFER_LENGTH;
   case sql::mysql::MYSQL_OPT_TLS_VERSION: return ::MYSQL_OPT_TLS_VERSION;
   case sql::mysql::MYSQL_OPT_SSL_MODE: return ::MYSQL_OPT_SSL_MODE;
+#endif
 
 
 #if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 80000
@@ -110,6 +112,8 @@ get_mysql_option(sql::mysql::MySQL_Connection_Options opt)
   case sql::mysql::MYSQL_OPT_GUESS_CONNECTION: return ::MYSQL_OPT_GUESS_CONNECTION;
   case sql::mysql::MYSQL_SET_CLIENT_IP: return ::MYSQL_SET_CLIENT_IP;
   case sql::mysql::MYSQL_SECURE_AUTH: return ::MYSQL_SECURE_AUTH;
+#endif
+#if MYCPPCONN_STATIC_MYSQL_VERSION_ID >= 50700
   case sql::mysql::MYSQL_OPT_SSL_ENFORCE: return ::MYSQL_OPT_SSL_ENFORCE;
 #endif