From: Andrey Hristov Date: Fri, 25 Feb 2011 16:44:39 +0000 (+0000) Subject: fix plugin counting, this is trunk only X-Git-Tag: php-5.4.0alpha1~191^2~200 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5373a3949c0146ab9ef4435aea159b25c5bff584;p=php fix plugin counting, this is trunk only --- diff --git a/ext/mysqlnd/mysqlnd_plugin.c b/ext/mysqlnd/mysqlnd_plugin.c index 97e1bada29..96ba9b68b3 100644 --- a/ext/mysqlnd/mysqlnd_plugin.c +++ b/ext/mysqlnd/mysqlnd_plugin.c @@ -148,14 +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); - ++mysqlnd_plugins_counter; + 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); } } - return mysqlnd_plugins_counter; - + return 0xCAFE; } /* }}} */