Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel

1 files changed, 3 insertions, 3 deletions

diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc
index 994c385796e..af585bb4302 100644
--- a/plugin/daemon_example/daemon_example.cc
+++ b/plugin/daemon_example/daemon_example.cc
@@ -60,7 +60,7 @@ pthread_handler_t mysql_heartbeat(void *p)
                 tm_tmp.tm_hour,
                 tm_tmp.tm_min,
                 tm_tmp.tm_sec);
-    my_write(con->heartbeat_file, buffer, strlen(buffer), MYF(0));
+    my_write(con->heartbeat_file, (uchar*) buffer, strlen(buffer), MYF(0));
     x++;
   }
 
@@ -114,7 +114,7 @@ static int daemon_example_plugin_init(void *p)
               tm_tmp.tm_hour,
               tm_tmp.tm_min,
               tm_tmp.tm_sec);
-  my_write(con->heartbeat_file, buffer, strlen(buffer), MYF(0));
+  my_write(con->heartbeat_file, (uchar*) buffer, strlen(buffer), MYF(0));
 
   pthread_attr_init(&attr);
   pthread_attr_setdetachstate(&attr,
@@ -168,7 +168,7 @@ static int daemon_example_plugin_deinit(void *p)
               tm_tmp.tm_hour,
               tm_tmp.tm_min,
               tm_tmp.tm_sec);
-  my_write(con->heartbeat_file, buffer, strlen(buffer), MYF(0));
+  my_write(con->heartbeat_file, (uchar*) buffer, strlen(buffer), MYF(0));
   my_close(con->heartbeat_file, MYF(0));
 
   my_free((char *)con, MYF(0));