bzr push into mysql-5.1 branch (jon.hauglid:3666 to 3667) Bug#12377872

[Jon Olav Hauglid]

 3667 Jon Olav Hauglid	2011-04-20
      BUG#12377872 ASSERTION FAILED: !_ENTERED WHEN GETHOSTBYADDR_R
                   FAILS ON SOLARIS
      
      This assertion was triggered if gethostbyaddr_r cannot do a
      reverse lookup on an ip address. The reason was a missing
      DBUG_RETURN macro. The problem affected only debug versions of
      the server.
      
      This patch fixes the problem by replacing return with DBUG_RETURN.
      No test case added.

    modified:
      sql/hostname.cc
 3666 Sergey Glukhov	2011-04-20
      Bug#11765923  58937: MANY VALGRIND ERRORS AFTER GROUPING BY RESULT OF DECIMAL COLUMN FUNCTION
      Bug#11764671  57533: UNINITIALISED VALUES IN COPY_AND_CONVERT (SQL_STRING.CC) WITH CERTAIN CHA
      When ROUND evaluates decimal result it uses Item::decimal
      value as fraction value for the result. In some cases
      Item::decimal is greater than real result fraction value
      and uninitialised memory of result(decimal) buffer can be
      used in further calculations. Issue is introduced by
      Bug33143 fix. The fix is to remove erroneous assignment.
     @ mysql-test/r/func_math.result
        test case
     @ mysql-test/t/func_math.test
        test case
     @ sql/item_func.cc
        remove erroneous assignment

    modified:
      mysql-test/r/func_math.result
      mysql-test/t/func_math.test
      sql/item_func.cc
=== modified file 'sql/hostname.cc'
--- a/sql/hostname.cc	2007-10-11 17:29:09 +0000
+++ b/sql/hostname.cc	2011-04-20 09:32:28 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
 
    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
@@ -183,7 +183,7 @@ char * ip_to_hostname(struct in_addr *in
 			   &tmp_hostent,buff,sizeof(buff),&tmp_errno)))
   {
     DBUG_PRINT("error",("gethostbyaddr_r returned %d",tmp_errno));
-    return 0;
+    DBUG_RETURN(0);
   }
   if (!(check=my_gethostbyname_r(hp->h_name,&tmp_hostent2,buff2,sizeof(buff2),
 				 &tmp_errno)))

No bundle (reason: useless for push emails).