From: Andrey Hristov <andrey@php.net>
Date: Fri, 25 Feb 2011 16:55:27 +0000 (+0000)
Subject: even better fix
X-Git-Tag: php-5.4.0alpha1~191^2~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a9e82d02016cbb5f8078694b9b01f8025b0c5ea;p=php

even better fix
---

diff --git a/ext/mysqlnd/mysqlnd_plugin.c b/ext/mysqlnd/mysqlnd_plugin.c
index 96ba9b68b3..a35346de0b 100644
--- a/ext/mysqlnd/mysqlnd_plugin.c
+++ b/ext/mysqlnd/mysqlnd_plugin.c
@@ -148,13 +148,13 @@ PHPAPI unsigned int mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header *
 	if (plugin) {
 		if (plugin->plugin_api_version == MYSQLND_PLUGIN_API_VERSION) {
 			zend_hash_update(&mysqlnd_registered_plugins, plugin->plugin_name, strlen(plugin->plugin_name) + 1, &plugin, sizeof(void *), NULL);
-			return mysqlnd_plugins_counter++;
 		} else {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Plugin API version mismatch while loading plugin %s. Expected %d, got %d",
-							plugin->plugin_name, MYSQLND_PLUGIN_API_VERSION, plugin->plugin_api_version);	
+							plugin->plugin_name, MYSQLND_PLUGIN_API_VERSION, plugin->plugin_api_version);
+			return 0xCAFE;
 		}
 	}
-	return 0xCAFE;
+	return mysqlnd_plugins_counter++;
 }
 /* }}} */