bzr push into mysql-trunk branch (Georgi.Kodinov:3339 to 3340)

[Georgi Kodinov]

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

    modified:
      sql-common/client_plugin.c
 3339 Marc Alff	2011-04-28
      Bug#12409247 - STAGE TIMER DEFAULT SHOULD BE NANOSECONDS
      
      Changed the STAGE timer default unit to be NANOSECOND.
      Adjusted the test suite accordingly.

    modified:
      mysql-test/suite/perfschema/r/column_privilege.result
      mysql-test/suite/perfschema/r/dml_setup_timers.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/t/column_privilege.test
      mysql-test/suite/perfschema/t/dml_setup_timers.test
      storage/perfschema/pfs_timer.cc
=== 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: useless for push emails).