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

[Georgi Kodinov]

 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
 3472 Sven Sandberg	2011-04-27
      Marked test experimental because it fails due to BUG#12403008

    modified:
      mysql-test/collections/default.experimental
=== 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: useless for push emails).