bk commit into 6.0 tree (msvensson:1.2657) BUG#32175

[msvensson]

Below is the list of changes that have just been committed into a local
6.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-09 15:25:24+01:00, msvensson@stripped +3 -0
  Bug#32175 Compile failure on FreeBSD with NDB
   - Add mysys/my_log.c
   - Change "#define log2" into function prototype "double log2(double)"

  include/my_global.h@stripped, 2007-11-09 15:25:21+01:00, msvensson@stripped +1 -5
    Change the #define log2 to a function declaration

  mysys/Makefile.am@stripped, 2007-11-09 15:25:21+01:00, msvensson@stripped +1 -1
    Compile my_log2.c

  mysys/my_log2.c@stripped, 2007-11-09 15:25:21+01:00, msvensson@stripped +26 -0
    New BitKeeper file ``mysys/my_log2.c''

  mysys/my_log2.c@stripped, 2007-11-09 15:25:21+01:00, msvensson@stripped +0 -0

diff -Nrup a/include/my_global.h b/include/my_global.h
--- a/include/my_global.h	2007-10-24 18:05:00 +02:00
+++ b/include/my_global.h	2007-11-09 15:25:21 +01:00
@@ -892,11 +892,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #endif
 
 #ifndef HAVE_LOG2
-/*
-  This will be slightly slower and perhaps a tiny bit less accurate than
-  doing it the IEEE754 way but log2() should be available on C99 systems.
-*/
-#define log2(X) (log(X) / M_LN2)
+double log2(double x);
 #endif
 
 /*
diff -Nrup a/mysys/Makefile.am b/mysys/Makefile.am
--- a/mysys/Makefile.am	2007-10-09 21:42:20 +02:00
+++ b/mysys/Makefile.am	2007-11-09 15:25:21 +01:00
@@ -52,7 +52,7 @@ libmysys_a_SOURCES =    my_init.c my_get
 			charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
 			my_gethostbyname.c rijndael.c my_aes.c sha1.c \
 			my_handler.c my_netware.c my_largepage.c \
-			my_memmem.c \
+			my_memmem.c my_log2.c \
 			my_windac.c my_access.c base64.c my_libwrap.c
 EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
 			thr_mutex.c thr_rwlock.c \
diff -Nrup a/mysys/my_log2.c b/mysys/my_log2.c
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysys/my_log2.c	2007-11-09 15:25:21 +01:00
@@ -0,0 +1,26 @@
+/* Copyright (C) 2000-2003 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 */
+
+#include "mysys_priv.h"
+
+#ifndef HAVE_LOG2
+/*
+  This will be slightly slower and perhaps a tiny bit less accurate than
+  doing it the IEEE754 way but log2() should be available on C99 systems.
+*/
+double log2(double x) {
+  return (log(x) / M_LN2);
+}
+#endif