[Commits] Rev 4148: MDEV-5706 - MariaDB does not build on hurd-i386 in lp:maria/5.5

Sergey Vojtovich svoj at mariadb.org
Tue Apr 15 13:32:22 EEST 2014


At lp:maria/5.5

------------------------------------------------------------
revno: 4148
revision-id: svoj at mariadb.org-20140415103212-3pqhoui5isy53hzg
parent: sergii at pisem.net-20140414175055-ca0rtunc4js485mz
committer: Sergey Vojtovich <svoj at mariadb.org>
branch nick: 5.5-mdev5706
timestamp: Tue 2014-04-15 14:32:12 +0400
message:
  MDEV-5706 - MariaDB does not build on hurd-i386
  
  Partially backport revno 4014 from 10.0.
  Disable threadpool on GNU/Hurd.
=== modified file 'sql/scheduler.h'
--- a/sql/scheduler.h	2014-03-17 12:04:28 +0000
+++ b/sql/scheduler.h	2014-04-15 10:32:12 +0000
@@ -99,7 +99,8 @@ struct thd_scheduler
   void *data;                  /* scheduler-specific data structure */
 };
 
-#if !defined(EMBEDDED_LIBRARY)
+#undef HAVE_POOL_OF_THREADS
+#if !defined(EMBEDDED_LIBRARY) && !defined(__GNU__)
 #define HAVE_POOL_OF_THREADS 1
 void pool_of_threads_scheduler(scheduler_functions* func,
    ulong *arg_max_connections,

=== modified file 'sql/threadpool_unix.cc'
--- a/sql/threadpool_unix.cc	2013-11-06 18:53:39 +0000
+++ b/sql/threadpool_unix.cc	2014-04-15 10:32:12 +0000
@@ -19,6 +19,9 @@
 #include <sql_class.h>
 #include <my_pthread.h>
 #include <scheduler.h>
+
+#ifdef HAVE_POOL_OF_THREADS
+
 #include <sql_connect.h>
 #include <mysqld.h>
 #include <debug_sync.h>
@@ -1678,3 +1681,5 @@ static void print_pool_blocked_message(b
     msg_written= true;
   }
 }
+
+#endif /* HAVE_POOL_OF_THREADS */



More information about the commits mailing list