From 04b601a7fe4c87d0b72f8b14c306a14c005846d7 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@mysql.com>
Date: Tue, 13 Apr 2010 13:48:46 +0200
Subject: Fix perfschema unittests build on Windows pthread_t is not defined
 unless my_pthread.h is included.

---
 storage/perfschema/unittest/pfs-t.cc                 | 1 +
 storage/perfschema/unittest/pfs_instr-oom-t.cc       | 1 +
 storage/perfschema/unittest/pfs_instr-t.cc           | 1 +
 storage/perfschema/unittest/pfs_instr_class-oom-t.cc | 1 +
 storage/perfschema/unittest/pfs_instr_class-t.cc     | 4 +++-
 5 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'storage/perfschema')

diff --git a/storage/perfschema/unittest/pfs-t.cc b/storage/perfschema/unittest/pfs-t.cc
index 012c6e7d87a..2f3fb2792fc 100644
--- a/storage/perfschema/unittest/pfs-t.cc
+++ b/storage/perfschema/unittest/pfs-t.cc
@@ -13,6 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <my_pthread.h>
 #include <sql_priv.h>
 #include <my_global.h>
 #include <pfs_server.h>
diff --git a/storage/perfschema/unittest/pfs_instr-oom-t.cc b/storage/perfschema/unittest/pfs_instr-oom-t.cc
index 4ea2e038b24..7b3df877133 100644
--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc
+++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc
@@ -13,6 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <my_pthread.h>
 #include <sql_priv.h>
 #include <my_global.h>
 #include <pfs_instr.h>
diff --git a/storage/perfschema/unittest/pfs_instr-t.cc b/storage/perfschema/unittest/pfs_instr-t.cc
index 4e73276b467..157031cb234 100644
--- a/storage/perfschema/unittest/pfs_instr-t.cc
+++ b/storage/perfschema/unittest/pfs_instr-t.cc
@@ -13,6 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <my_pthread.h>
 #include <sql_priv.h>
 #include <my_global.h>
 #include <pfs_instr.h>
diff --git a/storage/perfschema/unittest/pfs_instr_class-oom-t.cc b/storage/perfschema/unittest/pfs_instr_class-oom-t.cc
index 9cab0d18b33..064c8c062a4 100644
--- a/storage/perfschema/unittest/pfs_instr_class-oom-t.cc
+++ b/storage/perfschema/unittest/pfs_instr_class-oom-t.cc
@@ -13,6 +13,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <my_pthread.h>
 #include <sql_priv.h>
 #include <my_global.h>
 #include <pfs_instr_class.h>
diff --git a/storage/perfschema/unittest/pfs_instr_class-t.cc b/storage/perfschema/unittest/pfs_instr_class-t.cc
index 5d7e0bf734f..c8dce2fd7fb 100644
--- a/storage/perfschema/unittest/pfs_instr_class-t.cc
+++ b/storage/perfschema/unittest/pfs_instr_class-t.cc
@@ -13,8 +13,10 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <sql_priv.h>
+#include <my_pthread.h>
 #include <my_global.h>
+#include <sql_priv.h>
+
 #include <string.h>                             // strncpy
 #include <pfs_instr_class.h>
 #include <pfs_instr.h>
-- 
cgit v1.2.1