bzr commit into libmysql branch (georg.richter:2915) Bug#57559

[Georg Richter]

#At file:///home/georg/work/mysql/connectors/connector-c/ based on revid:georg.richter@stripped

 2915 Georg Richter	2010-10-19
      Fix for bug #57559
      bumped interface version for trace_api

    modified:
      include/client_plugin.h
      libmysql/plugin.c
=== modified file 'include/client_plugin.h'
--- a/include/client_plugin.h	2010-09-23 07:11:46 +0000
+++ b/include/client_plugin.h	2010-10-19 09:53:58 +0000
@@ -24,7 +24,7 @@ with this program; if not, write to the
 
 #include <stdarg.h>
 
-#define MYSQL_CLIENT_TRACE_INTERFACE_VERSION  0x0100
+#define MYSQL_CLIENT_TRACE_INTERFACE_VERSION  0x0102
 #define MYSQL_CLIENT_LOADDATA_INTERFACE_VERSION  0x0100
 
 /* known plugin types */

=== modified file 'libmysql/plugin.c'
--- a/libmysql/plugin.c	2010-09-27 11:12:35 +0000
+++ b/libmysql/plugin.c	2010-10-19 09:53:58 +0000
@@ -127,7 +127,7 @@ add_client_plugin(MYSQL *mysql, struct s
       (plugin->interface_version >> 8) >
        (plugin_interface_version[plugin->type] >> 8))
   {
-    errormsg= "Interface version not supported";
+    errormsg= "Plugin interface version not supported";
     goto error1;
   }
 
@@ -161,11 +161,11 @@ error2:
   if (plugin->deinit)
     plugin->deinit();
 error1:
-  if (dlhandle)
-    dlclose(dlhandle);
   set_mysql_extended_error(mysql, CR_PLUGIN_CANNOT_LOAD, unknown_sqlstate,
                            ER(CR_PLUGIN_CANNOT_LOAD), plugin->name,
                            errormsg);
+  if (dlhandle)
+    dlclose(dlhandle);
   DBUG_RETURN(NULL);
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]