bk commit into 6.0 tree (hakank:1.2652)

[Hakan Kuecuekilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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-05 20:49:06+01:00, hakank@stripped +13 -0
  Fix for Solaris/x86. With great help of Alexey Stroganov.
  
  Open issue noted by Alexey:
  - on Solaris dirent structure differs from Linux one so we may want 
    change test for directory on Solaris with following code:
  
    struct stat *s;
    stat(dir, s);
    if (s->st_mode & S_IFDIR) 
      return true;

  storage/falcon/DeferredIndex.cpp@stripped, 2007-11-05 20:49:00+01:00,
hakank@stripped +1 -0
    Fix for Solaris/x86.

  storage/falcon/Hdr.cpp@stripped, 2007-11-05 20:49:00+01:00, hakank@stripped +1 -0
    Fix for Solaris/x86.

  storage/falcon/Index2RootPage.cpp@stripped, 2007-11-05 20:49:00+01:00,
hakank@stripped +1 -0
    Fix for Solaris/x86.

  storage/falcon/IndexRootPage.cpp@stripped, 2007-11-05 20:49:00+01:00,
hakank@stripped +1 -0
    Fix for Solaris/x86.

  storage/falcon/MACAddress.cpp@stripped, 2007-11-05 20:49:00+01:00, hakank@stripped
+7 -0
    Fix for Solaris/x86.

  storage/falcon/MemMgr.cpp@stripped, 2007-11-05 20:49:00+01:00, hakank@stripped +1 -0
    Fix for Solaris/x86.

  storage/falcon/SRLCreateTableSpace.cpp@stripped, 2007-11-05 20:49:01+01:00,
hakank@stripped +1 -0
    Fix for Solaris/x86.

  storage/falcon/ScanDir.cpp@stripped, 2007-11-05 20:49:01+01:00, hakank@stripped +5
-3
    Fix for Solaris/x86.

  storage/falcon/SerialLogFile.cpp@stripped, 2007-11-05 20:49:01+01:00,
hakank@stripped +1 -0
    Fix for Solaris/x86.

  storage/falcon/SerialPipe.cpp@stripped, 2007-11-05 20:49:01+01:00, hakank@stripped
+1 -0
    Fix for Solaris/x86.

  storage/falcon/Table.cpp@stripped, 2007-11-05 20:49:01+01:00, hakank@stripped +1 -0
    Fix for Solaris/x86.

  storage/falcon/Thread.cpp@stripped, 2007-11-05 20:49:01+01:00, hakank@stripped +1 -1
    Fix for Solaris/x86.

  storage/falcon/Thread.h@stripped, 2007-11-05 20:49:01+01:00, hakank@stripped +4 -0
    Fix for Solaris/x86.

diff -Nrup a/storage/falcon/DeferredIndex.cpp b/storage/falcon/DeferredIndex.cpp
--- a/storage/falcon/DeferredIndex.cpp	2007-10-11 14:56:56 +02:00
+++ b/storage/falcon/DeferredIndex.cpp	2007-11-05 20:49:00 +01:00
@@ -14,6 +14,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <stdio.h>
+#include <string.h>
 #include <memory.h>
 #include "Engine.h"
 #include "Dbb.h"
diff -Nrup a/storage/falcon/Hdr.cpp b/storage/falcon/Hdr.cpp
--- a/storage/falcon/Hdr.cpp	2007-09-20 17:41:44 +02:00
+++ b/storage/falcon/Hdr.cpp	2007-11-05 20:49:00 +01:00
@@ -18,6 +18,7 @@
 //////////////////////////////////////////////////////////////////////
 
 #include <memory.h>
+#include <string.h>
 #include "Engine.h"
 #include "Hdr.h"
 #include "BDB.h"
diff -Nrup a/storage/falcon/Index2RootPage.cpp b/storage/falcon/Index2RootPage.cpp
--- a/storage/falcon/Index2RootPage.cpp	2007-09-20 17:41:47 +02:00
+++ b/storage/falcon/Index2RootPage.cpp	2007-11-05 20:49:00 +01:00
@@ -19,6 +19,7 @@
 
 #include <memory.h>
 #include <stdio.h>
+#include <string.h>
 #include "Engine.h"
 #include "Index2RootPage.h"
 #include "Index2Page.h"
diff -Nrup a/storage/falcon/IndexRootPage.cpp b/storage/falcon/IndexRootPage.cpp
--- a/storage/falcon/IndexRootPage.cpp	2007-10-11 14:11:36 +02:00
+++ b/storage/falcon/IndexRootPage.cpp	2007-11-05 20:49:00 +01:00
@@ -19,6 +19,7 @@
 
 #include <memory.h>
 #include <stdio.h>
+#include <string.h>
 #include "Engine.h"
 #include "IndexRootPage.h"
 #include "IndexPage.h"
diff -Nrup a/storage/falcon/MACAddress.cpp b/storage/falcon/MACAddress.cpp
--- a/storage/falcon/MACAddress.cpp	2007-09-24 12:56:42 +02:00
+++ b/storage/falcon/MACAddress.cpp	2007-11-05 20:49:00 +01:00
@@ -98,8 +98,15 @@ int MACAddress::getAddresses()
 	for (const char **device = devices; *device; ++device)
 		{
 		strncpy (request.ifr_name, *device, IFNAMSIZ);
+#ifdef SIOCGIFHWADDR
 		if (ioctl (fd, SIOCGIFHWADDR, &request) == 0)
 			macAddresses [count++] = getAddress (6, (UCHAR*) request.ifr_hwaddr.sa_data);
+#else
+#ifdef SIOCGENADDR
+		if (ioctl (fd, SIOCGENADDR, &request) == 0)
+			macAddresses [count++] = getAddress (6, (UCHAR*) request.ifr_ifru.ifru_enaddr[0]);
+#endif
+#endif
 		}
 
 	close (fd);
diff -Nrup a/storage/falcon/MemMgr.cpp b/storage/falcon/MemMgr.cpp
--- a/storage/falcon/MemMgr.cpp	2007-10-23 22:50:15 +02:00
+++ b/storage/falcon/MemMgr.cpp	2007-11-05 20:49:00 +01:00
@@ -19,6 +19,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #if defined(__APPLE__) || defined(__FreeBSD__)
 #include <stdlib.h>
 #else
diff -Nrup a/storage/falcon/SRLCreateTableSpace.cpp
b/storage/falcon/SRLCreateTableSpace.cpp
--- a/storage/falcon/SRLCreateTableSpace.cpp	2007-09-20 17:42:19 +02:00
+++ b/storage/falcon/SRLCreateTableSpace.cpp	2007-11-05 20:49:01 +01:00
@@ -17,6 +17,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <string.h>
 #include "Engine.h"
 #include "SRLCreateTableSpace.h"
 #include "TableSpace.h"
diff -Nrup a/storage/falcon/ScanDir.cpp b/storage/falcon/ScanDir.cpp
--- a/storage/falcon/ScanDir.cpp	2007-10-23 22:50:15 +02:00
+++ b/storage/falcon/ScanDir.cpp	2007-11-05 20:49:01 +01:00
@@ -131,13 +131,15 @@ bool ScanDir::isDirectory()
 #else
 	if (!data)
 		return false;
-		
-	if ( data->d_type == DT_DIR)
+
+#ifdef DT_DIR
+	if (data->d_type == DT_DIR)
 		return true;
+#endif
 	
 	struct stat buf;
 
-    if (stat (getFilePath(), &buf))
+	if (stat (getFilePath(), &buf))
 		return false;
 
 	return S_ISDIR (buf.st_mode);
diff -Nrup a/storage/falcon/SerialLogFile.cpp b/storage/falcon/SerialLogFile.cpp
--- a/storage/falcon/SerialLogFile.cpp	2007-09-20 17:42:35 +02:00
+++ b/storage/falcon/SerialLogFile.cpp	2007-11-05 20:49:01 +01:00
@@ -30,6 +30,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include <string.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdarg.h>
diff -Nrup a/storage/falcon/SerialPipe.cpp b/storage/falcon/SerialPipe.cpp
--- a/storage/falcon/SerialPipe.cpp	2007-10-11 14:12:03 +02:00
+++ b/storage/falcon/SerialPipe.cpp	2007-11-05 20:49:01 +01:00
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include <string.h>
 #include <memory.h>
 #include <stdio.h>
 #include <stdarg.h>
diff -Nrup a/storage/falcon/Table.cpp b/storage/falcon/Table.cpp
--- a/storage/falcon/Table.cpp	2007-10-15 15:57:59 +02:00
+++ b/storage/falcon/Table.cpp	2007-11-05 20:49:01 +01:00
@@ -17,6 +17,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
+#include <string.h>
 #include <memory.h>
 #include <stdio.h>
 #include "Engine.h"
diff -Nrup a/storage/falcon/Thread.cpp b/storage/falcon/Thread.cpp
--- a/storage/falcon/Thread.cpp	2007-09-20 17:42:45 +02:00
+++ b/storage/falcon/Thread.cpp	2007-11-05 20:49:01 +01:00
@@ -245,7 +245,7 @@ Thread* Thread::getThread(const char *de
 
 #ifdef _PTHREADS
 	if (!thread->threadId)
-		thread->threadId = (unsigned long) pthread_self();
+		thread->threadId = pthread_self();
 #endif
 
 	return thread;
diff -Nrup a/storage/falcon/Thread.h b/storage/falcon/Thread.h
--- a/storage/falcon/Thread.h	2007-09-20 17:42:45 +02:00
+++ b/storage/falcon/Thread.h	2007-11-05 20:49:01 +01:00
@@ -88,7 +88,11 @@ public:
 	void			(* volatile function)(void*);
 	void*			threadHandle;
 
+#ifdef _WIN32
 	unsigned long	threadId;
+#else
+	pthread_t	threadId;
+#endif
 	Threads			*threadBarn;
 	Thread			*next;				// next thread in "thread barn"
 	Thread			*prior;				// next thread in "thread barn"