List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:April 28 2011 10:19am
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3335 to 3337)
View as plain text  
 3337 Georgi Kodinov	2011-04-28 [merge]
      merge mysql-5.5->mysql-trunk

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

    modified:
      include/mysql/client_plugin.h
      include/mysql/client_plugin.h.pp
      libmysql/libmysql.def
 3335 Tor Didriksen	2011-04-28 [merge]
      Automerge opt-team => trunk

    modified:
      mysql-test/r/order_by_all.result
      sql/handler.cc
      sql/sql_select.cc
      sql/sql_select.h
=== 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 '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);

=== 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).
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3335 to 3337) Georgi Kodinov28 Apr