andrey                                   Fri, 25 Feb 2011 16:55:27 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=308679

Log:
even better fix

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 16:44:39 UTC 
(rev 308678)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_plugin.c      2011-02-25 16:55:27 UTC 
(rev 308679)
@@ -148,13 +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);
-                       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++;
 }
 /* }}} */


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to