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, 2008-02-12 18:30:20+01:00, msvensson@stripped +2 -0
  Bug#32175 Compile failure on FreeBSD with NDB

  include/my_global.h@stripped, 2008-02-12 18:30:13+01:00, msvensson@stripped +0 -8
    Move the define of 'log2' to a static inline function

  sql/mysql_priv.h@stripped, 2008-02-12 18:30:13+01:00, msvensson@stripped +13 -0
    Move the define of 'log2' to a static inline function

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	2008-02-12 18:30:13 +01:00
@@ -891,14 +891,6 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #define M_LN2 0.69314718055994530942
 #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)
-#endif
-
 /*
   Max size that must be added to a so that we know Size to make
   adressable obj.
diff -Nrup a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h	2007-11-05 19:17:37 +01:00
+++ b/sql/mysql_priv.h	2008-02-12 18:30:13 +01:00
@@ -2314,6 +2314,19 @@ inline bool is_user_table(TABLE * table)
   return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
 }
 
+
+#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.
+*/
+static inline double log2(double x)
+{
+  return (log(x) / M_LN2);
+}
+#endif
+
+
 /*
   Some functions that are different in the embedded library and the normal
   server