svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_plugin.c
| From: | Andrey Hristov | Date: | Fri, 25 Feb 2011 16:44:39 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_plugin.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64603@lists.php.net to get a copy of this message | ||
andrey Fri, 25 Feb 2011 16:44:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308678
Log:
fix plugin counting, this is trunk only
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd_plugin.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_plugin.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_plugin.c 2011-02-25 15:55:13 UTC (rev 308677)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_plugin.c 2011-02-25 16:44:39 UTC (rev 308678)
@@ -148,14 +148,13 @@
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;
}
/* }}} */