From: Georgi Kodinov
Date: April 28 2011 9:57am
Subject: bzr commit into mysql-trunk branch (Georgi.Kodinov:3336)
List-Archive: http://lists.mysql.com/commits/136282
Message-Id: <201104280957.p3S9v7t7005603@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/kgeorge/mysql/work/B12325444-trunk/ based on revid:tor.didriksen@stripped

 3336 Georgi Kodinov	2011-04-28 [merge]
      merged mysql-5.5->mysql-trunk

    modified:
      include/mysql/client_plugin.h
      libmysql/libmysql.def
=== modified file 'include/mysql/client_plugin.h'
--- a/include/mysql/client_plugin.h	2010-11-10 15:55:57 +0000
+++ b/include/mysql/client_plugin.h	2011-04-06 14:31:26 +0000
@@ -156,8 +156,7 @@ mysql_client_register_plugin(struct st_m
 
   @retval 0 on success, 1 in case of failure
 **/
-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);
 #endif
 

=== modified file 'libmysql/libmysql.def'
--- a/libmysql/libmysql.def	2010-10-04 12:54:41 +0000
+++ b/libmysql/libmysql.def	2011-04-06 14:31:26 +0000
@@ -104,4 +104,3 @@ EXPORTS
 	mysql_server_end
 	mysql_set_character_set
 	mysql_get_character_set_info
-        mysql_plugin_options

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).