--- mysql.cc.orig	2015-07-02 09:47:14.000000000 -0700
+++ mysql.cc	2015-07-02 09:48:35.000000000 -0700
@@ -1199,7 +1199,7 @@
   glob_buffer.realloc(512);
   completion_hash_init(&ht, 128);
   init_alloc_root(&hash_mem_root, 16384, 0, MYF(0));
-  bzero((char*) &mysql, sizeof(mysql));
+  memset((char *) &mysql, 0, sizeof(mysql));
   if (sql_connect(current_host,current_db,current_user,opt_password,
 		  opt_silent))
   {
@@ -4212,7 +4212,7 @@
   my_bool save_rehash= opt_rehash;
   int error;
 
-  bzero(buff, sizeof(buff));
+  memset(buff, 0, sizeof(buff));
   if (buffer)
   {
     /*
@@ -4360,7 +4360,7 @@
   char *tmp, buff[FN_REFLEN + 1];
   int select_db;
 
-  bzero(buff, sizeof(buff));
+  memset(buff, 0, sizeof(buff));
   strmake_buf(buff, line);
   tmp= get_arg(buff, 0);
   if (!tmp || !*tmp)