List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:April 29 2011 8:39am
Subject:bzr commit into mysql-trunk branch (Georgi.Kodinov:3340)
View as plain text  
#At file:///Users/kgeorge/mysql/work/mysql-trunk/ based on revid:marc.alff@stripped

 3340 Georgi Kodinov	2011-04-29 [merge]
      merge mysql-5.5->mysql-trunk

=== modified file 'sql-common/client_plugin.c'
--- a/sql-common/client_plugin.c	2011-03-17 14:06:30 +0000
+++ b/sql-common/client_plugin.c	2011-04-29 08:37:43 +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: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
bzr commit into mysql-trunk branch (Georgi.Kodinov:3340) Georgi Kodinov29 Apr