Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
plugin/fulltext/plugin_example.c:
  e
  C
sql/field.h:
  e

1 files changed, 2 insertions, 2 deletions

diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c
index 47beca18dc7..4194f1df689 100644
--- a/plugin/fulltext/plugin_example.c
+++ b/plugin/fulltext/plugin_example.c
@@ -62,7 +62,7 @@ static long number_of_calls= 0; /* for SHOW STATUS, see below */
     1                    failure (cannot happen)
 */
 
-static int simple_parser_plugin_init(void *p)
+static int simple_parser_plugin_init(void *arg __attribute__((unused)))
 {
   return(0);
 }
@@ -81,7 +81,7 @@ static int simple_parser_plugin_init(void *p)
 
 */
 
-static int simple_parser_plugin_deinit(void *p)
+static int simple_parser_plugin_deinit(void *arg __attribute__((unused)))
 {
   return(0);
 }