bzr push into mysql-5.5 branch (Georgi.Kodinov:3475 to 3476) Bug#12325444

[Georgi Kodinov]

 3476 Georgi Kodinov	2011-04-29
      Addendum to the fix for bug #12325444
      Removed STDCALL from the function definition.

    modified:
      sql-common/client_plugin.c
 3475 Georgi Kodinov	2011-04-28
      Backport of (part of) bug #11760838 to 5.5.
      Enabled the ABI check to run on MacOSX.

    modified:
      cmake/abi_check.cmake
=== modified file 'sql-common/client_plugin.c'
--- a/sql-common/client_plugin.c	2011-03-17 13:52:49 +0000
+++ b/sql-common/client_plugin.c	2011-04-29 08:33:17 +0000
@@ -460,7 +460,7 @@ mysql_client_find_plugin(MYSQL *mysql, c
 
 
 /* see <mysql/client_plugin.h> for a full description */
-int STDCALL mysql_plugin_options(struct st_mysql_client_plugin *plugin,
+int mysql_plugin_options(struct st_mysql_client_plugin *plugin,
                                  const char *option,
                                  const void *value)
 {

No bundle (reason: useless for push emails).