Merge lp:~atcurtis/maria/5.5-dfly into lp:maria/5.5

[Antony T Curtis]

[Sergei Golubchik (sergii)]

Did you check other places with #ifdef __FreeBSD__ ?
I've grepped for "freebsd" and here're few questions:

is cmake/os/FreeBSD.cmake used in your builds? Should it be?

dtrace.cmake might enable dtrace because the system name is not "freebsd". Is that correct?

I presume, system libedit is always available, is that right? If no - should freebsd-specific places in the bundled readline be extended?

yassl has bsd-specific code in one file

libmysql/CMakeLists.txt checks for "freebsd or apple" when making its compatibility workaround

./mysys/my_fopen.c
./mysys/my_gethwaddr.c
./sql/mysqld.cc

these files have bsd-specific code too, they might need changes.

review: Needs Fixing

Unmerged revisions

3493. By Antony T Curtis on 2012-08-15

Simple change to permit building on DragonFlyBSD

=== modified file 'BUILD/check-cpu'
--- BUILD/check-cpu	2012-01-13 14:50:02 +0000
+++ BUILD/check-cpu	2012-08-15 07:24:23 +0000
@@ -134,7 +134,7 @@
     # Fallback when there is no /proc/cpuinfo
     CPUINFO=" "
     case "`uname -s`" in
-      FreeBSD|OpenBSD)
+      FreeBSD|OpenBSD|DragonFly)
         cpu_family=`uname -m`;
         model_name=`sysctl -n hw.model`
         ;;

=== modified file 'sql/threadpool_unix.cc'
--- sql/threadpool_unix.cc	2012-04-11 23:40:44 +0000
+++ sql/threadpool_unix.cc	2012-08-15 07:24:23 +0000
@@ -30,7 +30,7 @@
 #include <sys/epoll.h>
 typedef struct epoll_event native_event;
 #endif
-#if defined (__FreeBSD__) || defined (__APPLE__)
+#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__DragonFly__)
 #include <sys/event.h>
 typedef struct kevent native_event;
 #endif
@@ -286,7 +286,7 @@
   return event->data.ptr;
 }
 
-#elif defined (__FreeBSD__) || defined (__APPLE__)
+#elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__DragonFly__)
 int io_poll_create()
 {
   return kqueue();