From: Georgi Kodinov
Date: April 28 2011 10:08am
Subject: bzr push into mysql-5.5 branch (Georgi.Kodinov:3473 to 3474) Bug#12325444
List-Archive: http://lists.mysql.com/commits/136284
X-Bug: 12325444
Message-Id: <201104281009.p3SA915f026158@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3474 Georgi Kodinov	2011-04-28
      Fixed the ABI check files after the push of bug # 12325444.

    modified:
      include/mysql/client_plugin.h.pp
 3473 Georgi Kodinov	2011-04-06
      Bug #12325444 : 60746: CLIENT_PLUGIN.H IS BROKEN 
      
      Removed the STDCALL macro and the function from the .def file,
      since it's not used by the connectors atm.

    modified:
      include/mysql/client_plugin.h
      libmysql/libmysql.def
=== modified file 'include/mysql/client_plugin.h.pp'
--- a/include/mysql/client_plugin.h.pp	2010-10-13 15:11:29 +0000
+++ b/include/mysql/client_plugin.h.pp	2011-04-28 10:08:05 +0000
@@ -35,6 +35,5 @@ mysql_client_find_plugin(struct st_mysql
 struct st_mysql_client_plugin *
 mysql_client_register_plugin(struct st_mysql *mysql,
                              struct st_mysql_client_plugin *plugin);
-int STDCALL mysql_plugin_options(struct st_mysql_client_plugin *plugin,
-                                 const char *option,
-                                 const void *value);
+int mysql_plugin_options(struct st_mysql_client_plugin *plugin,
+                         const char *option, const void *value);

No bundle (reason: useless for push emails).