List:Commits« Previous MessageNext Message »
From:jbalint Date:March 21 2008 11:37pm
Subject:Connector/ODBC 3.51 commit: r1081 - trunk/driver
View as plain text  
Modified:
   trunk/driver/connect.c
Log:
add ifdefs for building with old headers


Modified: trunk/driver/connect.c
===================================================================
--- trunk/driver/connect.c	2008-03-20 22:05:48 UTC (rev 1080)
+++ trunk/driver/connect.c	2008-03-21 23:37:52 UTC (rev 1081)
@@ -146,9 +146,11 @@
   /* set SSL parameters */
   mysql_ssl_set(mysql, ds->pszSSLKEY, ds->pszSSLCERT, ds->pszSSLCA,
                 ds->pszSSLCAPATH, ds->pszSSLCIPHER);
+#ifdef MYSQL_OPT_SSL_VERIFY_SERVER_CERT /* disabled if not in build headers */
   if (ds->pszSSLVERIFY)
     mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,
                   (const char *)&opt_ssl_verify_server_cert);
+#endif /* MYSQL_OPT_SSL_VERIFY_SERVER_CERT */
 
   if (!mysql_real_connect(mysql, ds->pszSERVER, ds->pszUSER, ds->pszPASSWORD,
                           ds->pszDATABASE, port, ds->pszSOCKET, flags))
@@ -198,12 +200,14 @@
   strxmov(dbc->st_error_prefix, MYODBC3_ERROR_PREFIX, "[mysqld-",
           mysql->server_version, "]", NullS);
 
+#ifdef MYSQL_OPT_RECONNECT /* disabled if not included in build header */
   /* This needs to be set after connection, or it doesn't stick.  */
   if (options & FLAG_AUTO_RECONNECT)
   {
     my_bool reconnect= 1;
     mysql_options(mysql, MYSQL_OPT_RECONNECT, (char *)&reconnect);
   }
+#endif /* MYSQL_OPT_RECONNECT */
 
   /* Make sure autocommit is set as configured. */
   if (dbc->commit_flag == CHECK_AUTOCOMMIT_OFF)

Thread
Connector/ODBC 3.51 commit: r1081 - trunk/driverjbalint22 Mar