Index: ext/pdo_mysql/mysql_driver.c
--- ext/pdo_mysql/mysql_driver.c.orig	2013-08-20 06:46:43.000000000 +0200
+++ ext/pdo_mysql/mysql_driver.c	2013-08-24 09:40:43.479060494 +0200
@@ -710,7 +710,7 @@
 			}
 		}
 
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
 		{
 			char *public_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL TSRMLS_CC);
 			if (public_key) {
Index: ext/pdo_mysql/pdo_mysql.c
--- ext/pdo_mysql/pdo_mysql.c.orig	2013-08-20 06:46:43.000000000 +0200
+++ ext/pdo_mysql/pdo_mysql.c	2013-08-24 09:41:27.329049326 +0200
@@ -118,7 +118,7 @@
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (long)PDO_MYSQL_ATTR_SSL_CA);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (long)PDO_MYSQL_ATTR_SSL_CAPATH);
 	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (long)PDO_MYSQL_ATTR_SSL_CIPHER);
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
 	 REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
 #endif
 
Index: ext/pdo_mysql/php_pdo_mysql_int.h
--- ext/pdo_mysql/php_pdo_mysql_int.h.orig	2013-08-20 06:46:43.000000000 +0200
+++ ext/pdo_mysql/php_pdo_mysql_int.h	2013-08-24 09:41:51.389061535 +0200
@@ -171,7 +171,7 @@
 	PDO_MYSQL_ATTR_SSL_CA,
 	PDO_MYSQL_ATTR_SSL_CAPATH,
 	PDO_MYSQL_ATTR_SSL_CIPHER,
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
 	PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY
 #endif
 };