[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_plugin.c

[Andrey Hristov]

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

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

[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_plugin.c

[Andrey Hristov]

andrey   Fri, 25 Feb 2011 16:44:39 +

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;
 }
 /* }}} */


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

[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_plugin.c

[Andrey Hristov]

andrey   Mon, 10 Jan 2011 15:28:52 +

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

Log:
plug a leak

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-01-10 15:14:56 UTC 
(rev 307340)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_plugin.c  2011-01-10 15:28:52 UTC 
(rev 307341)
@@ -75,11 +75,10 @@
 static
 enum_func_status mysqlnd_example_plugin_end(void * p TSRMLS_DC)
 {
-#if A0
struct st_mysqlnd_typeii_plugin_example * plugin = (struct 
st_mysqlnd_typeii_plugin_example *) p;
-#endif
DBG_ENTER("mysqlnd_example_plugin_end");
-
+   mysqlnd_stats_end(plugin->plugin_header.plugin_stats.values);
+   plugin->plugin_header.plugin_stats.values = NULL;
DBG_RETURN(PASS);
 }
 /* }}} */

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