even better fix

faizshukri · faizshukri · commit 2a9e82d02016 · 2011-02-25T16:55:27.000Z
diff --git 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++;
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -148,13 +148,13 @@ PHPAPI unsigned int mysqlnd_plugin_register_ex(struct st_mysqlnd_plugin_header *`
`148`	`148`	`if (plugin) {`
`149`	`149`	`if (plugin->plugin_api_version == MYSQLND_PLUGIN_API_VERSION) {`
`150`	`150`	`zend_hash_update(&mysqlnd_registered_plugins, plugin->plugin_name, strlen(plugin->plugin_name) + 1, &plugin, sizeof(void *), NULL);`
`151`		`- return mysqlnd_plugins_counter++;`
`152`	`151`	`} else {`
`153`	`152`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "Plugin API version mismatch while loading plugin %s. Expected %d, got %d",`
`154`		`- plugin->plugin_name, MYSQLND_PLUGIN_API_VERSION, plugin->plugin_api_version);`
	`153`	`+ plugin->plugin_name, MYSQLND_PLUGIN_API_VERSION, plugin->plugin_api_version);`
	`154`	`+ return 0xCAFE;`
`155`	`155`	`}`
`156`	`156`	`}`
`157`		`- return 0xCAFE;`
	`157`	`+ return mysqlnd_plugins_counter++;`
`158`	`158`	`}`
`159`	`159`	`/* }}} */`
`160`	`160`