bk commit into 5.2 tree (elliot:1.2077)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.2 repository of emurphy. When emurphy 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
  1.2077 06/01/24 14:06:18 elliot@stripped +1 -0
  Merge mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new
  into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.2-merge

  configure.in
    1.332 06/01/24 14:06:05 elliot@stripped +0 -1
    Manual merge version number.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	elliot
# Host:	xan.(none)
# Root:	/home/emurphy/src/mysql/bk-clean/mysql-5.2-merge/RESYNC

--- 1.331/configure.in	2006-01-06 09:22:44 -05:00
+++ 1.332/configure.in	2006-01-24 14:06:05 -05:00
@@ -15,12 +15,6 @@
 # See the libtool docs for information on how to do shared lib versions.
 SHARED_LIB_VERSION=15:0:0
 
-# ndb version
-NDB_VERSION_MAJOR=5
-NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=19
-NDB_VERSION_STATUS=""
-
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
@@ -1426,6 +1420,7 @@
 if test "$with_named_thread" != "no"
 then
   LIBS="$with_named_thread $LIBS $with_named_thread"
+  CLIENT_THREAD_LIBS="$with_named_thread"
   with_posix_threads="yes"
   AC_MSG_RESULT("$with_named_thread")
 else
@@ -1442,6 +1437,7 @@
     AC_MSG_CHECKING("for pthread_create in -lpthread");
     ac_save_LIBS="$LIBS"
     LIBS="$LIBS -lpthread"
+    CLIENT_THREAD_LIBS="-lpthread"
     AC_TRY_LINK(
     [#include <pthread.h>],
     [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1450,6 +1446,7 @@
     if test "$with_posix_threads" = "no"
     then
       LIBS=" $ac_save_LIBS -lpthreads"
+      CLIENT_THREAD_LIBS="-lpthreads"
       AC_MSG_CHECKING("for pthread_create in -lpthreads");
       AC_TRY_LINK(
       [#include <pthread.h>],
@@ -1460,6 +1457,7 @@
       then
         # This is for FreeBSD
         LIBS="$ac_save_LIBS -pthread"
+        CLIENT_THREAD_LIBS="-pthread"
         AC_MSG_CHECKING("for pthread_create in -pthread");
         AC_TRY_LINK(
         [#include <pthread.h>],
@@ -2443,7 +2441,8 @@
  \$(top_builddir)/storage/archive/libarchive.a, [
   AC_CONFIG_FILES(storage/archive/Makefile)
 ])
-MYSQL_STORAGE_ENGINE(csv,,,,,no,storage/csv,,,[
+MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,storage/csv,no,
+  \$(top_builddir)/storage/csv/libcsv.a,[
   AC_CONFIG_FILES(storage/csv/Makefile)
 ])
 MYSQL_STORAGE_ENGINE(blackhole)
@@ -2475,6 +2474,7 @@
 CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
 
 AC_SUBST(CLIENT_LIBS)
+AC_SUBST(CLIENT_THREAD_LIBS)
 AC_SUBST(NON_THREADED_LIBS)
 AC_SUBST(STATIC_NSS_FLAGS)
 AC_SUBST(sql_client_dirs)