From: Davi Arnaut
Date: July 2 2010 9:42pm
Subject: bzr commit into mysql-5.1-bugteam branch (davi:3459) Bug#53445
List-Archive: http://lists.mysql.com/commits/112811
X-Bug: 53445
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8384634427046341262=="

--===============8384634427046341262==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# At a local mysql-5.1-bugteam repository of davi

 3459 Davi Arnaut	2010-07-02
      Bug#53445: Build with -Wall and fix warnings that it generates
      
      If bzero is not available, resort to memset. Also, remove dead
      bzero.c

    removed:
      strings/bzero.c
    modified:
      include/m_string.h
=== modified file 'include/m_string.h'
--- a/include/m_string.h	2010-07-02 18:30:47 +0000
+++ b/include/m_string.h	2010-07-02 21:42:32 +0000
@@ -58,6 +58,10 @@
 # define bfill(A,B,C)           memset((A),(C),(B))
 #endif
 
+#if !defined(bzero) && !defined(HAVE_BZERO)
+# define bzero(A,B)             memset((A),0,(B))
+#endif
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -104,10 +108,6 @@ extern const double log_10[309];
 extern	void bfill(uchar *dst,size_t len,pchar fill);
 #endif
 
-#if !defined(bzero) && !defined(HAVE_BZERO)
-extern	void bzero(uchar * dst,size_t len);
-#endif
-
 #ifndef bmove512
 extern	void bmove512(uchar *dst,const uchar *src,size_t len);
 #endif

=== removed file 'strings/bzero.c'
--- a/strings/bzero.c	2006-12-23 19:17:15 +0000
+++ b/strings/bzero.c	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/* Copyright (C) 2000 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/*  File   : bzero.c
-    Author : Richard A. O'Keefe.
-	     Michael Widenius;	ifdef MC68000
-    Updated: 23 April 1984
-    Defines: bzero()
-
-    bzero(dst, len) moves "len" 0 bytes to "dst".
-    Thus to clear a disc buffer to 0s do bzero(buffer, BUFSIZ).
-
-    Note: the "b" routines are there to exploit certain VAX order codes,
-    The asm code is presented for your interest and amusement.
-*/
-
-#ifndef BSD_FUNCS
-#include "strings.h"
-
-#ifdef bzero
-#undef bzero					/* remove macro */
-#endif
-
-#if VaxAsm
-
-static void _bzero64 _A((char *dst,int	len));
-
-void bzero(dst, len)
-char *dst;
-uint len;
-{
-  while ((int) len >= 64*K)
-  {
-    _bzero64(dst, 64*K-1);
-    dst += 64*K-1;
-    len -= 64*K-1;
-  }
-  _bzero64(dst, len);
-}
-
-_bzero64(dst, len)
-char *dst;
-int  len;
-{
-  asm("movc5 $0,*4(ap),$0,8(ap),*4(ap)");
-}
-
-#else
-
-#if defined(MC68000) && defined(DS90)
-
-void bzero(dst, len)
-char *dst;
-uint len;
-{
-  bfill(dst,len,0);				/* This is very optimized ! */
-} /* bzero */
-
-#else
-
-void bzero(dst, len)
-register char *dst;
-register uint len;
-{
-  while (len-- != 0) *dst++ = 0;
-} /* bzero */
-
-#endif
-#endif
-#endif /* BSD_FUNCS */


--===============8384634427046341262==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/davi.arnaut@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: davi.arnaut@stripped
# target_branch: file:///home/davi/bzr/stage/mysql-5.1-bugteam/
# testament_sha1: 441a1e279373c29fc670e29256851cb77251500d
# timestamp: 2010-07-02 18:42:41 -0300
# source_branch: file:///home/davi/bzr/mysql-5.0-bugteam/
# base_revision_id: davi.arnaut@stripped\
#   fyw33fu1rc9j6qzw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUzOnd4AAZRfgAAweWf/935i
mZC////wUAPC90Y3dV1YFBohGhMmRHppgp5J5J6mEehMDUwjIEpBT0mPUMKnpTan6ptJ6bUjCNpA
DTBNpBoiMjKaA0BpoBo0AAAAA5piYCNMCMIwAAABMIwEkkZGgJpppqn6TBTJ5E8oA2kADERq6Ypg
zcr5OWWARxDGlDesxMYZMBpKJEJS1ATcOBF7bDsdMjMXbx1UsydVApWEyOlC6F+tyoOAoPHd4ZTO
g/ObsisGAljwuYRUy04m1ZyQZCnmYyOPWYcD4Y3VUWrO1EmFlVEI8RCHKu7pD4UlkJzFvQbYdk6o
2MEKNEMkwbXLk5dATGTmdqdeSCMqxFhIrzNARIdoVOlgIdKdycmGJxLQ8ZSpEjoBKMQZ4hFWYEJW
uTJQStF0OlCCR5fhe/ZzkV84c7iBoghqtVXpNEJDI/wM+FsgoUiKxSiNQtFeGZwYeh2+iuUKCwhU
KPkFkuFRMbGMzzYZ2sskDEXtREbRGaK2DC10UQmtIXhUnQa04isHs0OBqlFcGGwJX03tFcTpB5qH
0XFSqwe5t08ayl8bEVjB/oEEIDhDW4y5na+LAW1U05jgt9g0FrhGdLKrYQVJkik9yipEjcFw/CkS
8qIhhZCTWQtdFqBrTUxANRkbpuB4BSzg0jHTflnpMUt3ZZENQ6tF/K4x4yMd+crTSOS+/645v/Or
vXjpyqjhvkLOKRaWsThQH9sGja4Q8ymAd/h52z2w3R+tSN4jpLfnadpikFHxLhGnvLRIK0JPbrYH
xesUJ4RJfFdZFw1P6vp2IDdynjp8jQkEF7gny6c7Gm7smKGsnXSCdcQTzwrDoeAzphXeg8TPW/iO
9LlZ8QqObNpijCQrTmmkFSHHAL2dhsCx8PI975vQuEum/WyX+aZ1nfJxijEvXGd97g1v16VIDQej
nnCRutn7RQmsrEgsiMegeCBxsqZI2REgZXAD0AezBWvkS0qydo+tOc5AcsU2yYiDzYLHuRj/dmwn
LFNBSryB6Xqi7+O5+cKLgbh2UvXLaGJpB5zT9eQThI4N1LHvYyM2VwukbaxGQvgxkqDy042GMc8z
xxx6pJoXJDKNIKL2YJRRcnOcip9Ez0PZMpcW2MYsctpekTBoFzgThFRjIs9t8omerL2ZSD9UOAsI
cNhfjhXccgllUhWG2T1hdBDVbnD9+CitxOCeEr76TYTwbWJk7A1+xyKL3yZsihxXEOY6K47qOv4t
ykKAnX0EOw3X3uy07WOgiDszGQ3U2GRO1rlW4fYFqMRj2JAq3BxUd/U0vnQkTgusaylOBXhWKg0h
3GbtCV2/bfUK+TExK1ArVsLwzPKwm4B/xdyRThQkEzOnd4A=


--===============8384634427046341262==--