bzr push into mysql-5.1 branch (jonas:3037 to 3038)

[Jonas Oreland]

 3038 Jonas Oreland	2008-11-05 [merge]
      merge 63 to 64
modified:
  configure.in
  storage/ndb/src/common/portlib/NdbThread.c

 3037 Jonas Oreland	2008-11-04
      ndb - add multi connect to flexAsync
modified:
  storage/ndb/test/ndbapi/flexAsynch.cpp

=== modified file 'configure.in'
--- a/configure.in	2008-10-30 13:27:52 +0000
+++ b/configure.in	2008-11-05 09:04:43 +0000
@@ -2098,8 +2098,7 @@ AC_TRY_LINK(
    int policy = 0;
    pid_t tid = (unsigned)syscall(SYS_gettid);
    tid = getpid();
-   int ret = sched_setaffinity(tid, sizeof(unsigned long),
-                               (const cpu_set_t*)p);
+   int ret = sched_setaffinity(tid, sizeof(* p), p);
    ret = sched_setscheduler(tid, policy, &loc_sched_param);],
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_LINUX_SCHEDULING, [1], [Linux scheduling/locking function]),
@@ -2111,10 +2110,9 @@ AC_TRY_LINK(
    #include <sys/lwp.h>
    #include <sys/processor.h>
    #include <sys/procset.h>],
-  [processor_id_t *pid = (processor_id_t *)0;
-   processor_id_t cpu_id = (processor_id_t)0;
-   id_t tid = _lw_self();
-   int ret = processor_bind(P_LWPID, tid, cpu_id, bind);],
+  [processorid_t cpu_id = (processorid_t)0;
+   id_t tid = _lwp_self();
+   int ret = processor_bind(P_LWPID, tid, cpu_id, 0);],
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_SOLARIS_AFFINITY, [1], [Solaris affinity function]),
   AC_MSG_RESULT(no))

=== modified file 'storage/ndb/src/common/portlib/NdbThread.c'
--- a/storage/ndb/src/common/portlib/NdbThread.c	2008-08-21 06:37:06 +0000
+++ b/storage/ndb/src/common/portlib/NdbThread.c	2008-11-05 09:04:43 +0000
@@ -271,7 +271,7 @@ NdbThread_getThreadId()
 #else
 #ifdef HAVE_SOLARIS_AFFINITY
   id_t tid;
-  tid = _lw_self();
+  tid = _lwp_self();
   return tid;
 #else
   return 0;