diff options
| author | Andrey Hristov <andrey@php.net> | 2011-02-25 16:55:27 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2011-02-25 16:55:27 +0000 |
| commit | 2a9e82d02016cbb5f8078694b9b01f8025b0c5ea (patch) | |
| tree | 1a8654ced1166f1e8ed773c5f42acc4d3141f286 /ext/mysqlnd/mysqlnd_plugin.c | |
| parent | 5373a3949c0146ab9ef4435aea159b25c5bff584 (diff) | |
| download | php-git-2a9e82d02016cbb5f8078694b9b01f8025b0c5ea.tar.gz | |
even better fix
Diffstat (limited to 'ext/mysqlnd/mysqlnd_plugin.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_plugin.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_plugin.c b/ext/mysqlnd/mysqlnd_plugin.c index 96ba9b68b3..a35346de0b 100644 --- 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++; } /* }}} */ |