Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0

into zim.(none):/home/brian/mysql/mysql-5.0

BitKeeper/etc/gone

@@ -455,6 +455,7 @@ arjen@co3064164-a.bitbike.com|Docs/section.Comparisons.texi|20011108043647|22614
 arjen@fred.bitbike.com|scripts/mysql_fix_extensions.sh|20020516001337|12363|f1048a78f4759b4d
 ccarkner@nslinuxw10.bedford.progress.com|mysql-test/r/isolation.result|20010327145543|25059|4da11e109a3d93a9
 ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456
+fs
 jani@hynda.mysql.fi|client/mysqlcheck|20010419221207|26716|363e3278166d84ec
 jcole@tetra.bedford.progress.com|BitKeeper/etc/logging_ok|20001004201211|30554
 jimw@mysql.com|mysql-test/t/ndb_alter_table.disabled|20050311230559|27526|411e026940e7a0aa
@@ -465,6 +466,7 @@ jimw@mysql.com|mysql-test/t/ndb_cache_multi.disabled|20050311230600|18039|9657b6
 jimw@mysql.com|mysql-test/t/ndb_cache_multi2.disabled|20050311230600|47901|84fed1a78c0d3e6d
 jimw@mysql.com|mysql-test/t/ndb_multi.disabled|20050311230600|12240|2599367ad06100f6
 jimw@mysql.com|mysql-test/t/ndb_restore.disabled|20050311230600|30718|3c2453d6164b1a30
+korbit-kernel-2.4.1
 magnus@neptunus.(none)|ndb/src/client/Makefile|20040414084436|02010|6c2778d2bf4954a2
 magnus@neptunus.(none)|ndb/src/client/odbc/Extra.mk|20040414082358|47442|eabbb28986ca817d
 magnus@neptunus.(none)|ndb/src/client/odbc/Makefile|20040414084435|33394|9bc928a18aa88d66

Makefile.am

@@ -25,14 +25,14 @@ SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \
 			@thread_dirs@ pstack \
 			@sql_union_dirs@ scripts man tests \
 			netware @libmysqld_dirs@ \
-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+			@bench_dirs@ support-files @tools_dirs@
 
 DIST_SUBDIRS =		. include @docs_dirs@ zlib \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack \
 			@sql_union_dirs@ scripts @man_dirs@ tests SSL\
 			BUILD netware os2 @libmysqld_dirs@ \
-			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+			@bench_dirs@ support-files @tools_dirs@
 
 # Relink after clean
 linked_sources = linked_client_sources linked_server_sources \

config/ac-macros/mysqlfs.m4

-
-AC_DEFUN([MYSQL_CHECK_MYSQLFS], [
-  AC_ARG_WITH([mysqlfs],
-              [
-  --with-mysqlfs          Include the corba-based MySQL file system],
-              [mysqlfs="$withval"],
-              [mysqlfs=no])
-
-dnl Call MYSQL_CHECK_ORBIT even if mysqlfs == no, so that @orbit_*@
-dnl get substituted.
-  MYSQL_CHECK_ORBIT
-
-  AC_MSG_CHECKING(if we should build MySQLFS)
-  fs_dirs=""
-  if test "$mysqlfs" = "yes"
-  then
-    if test -n "$orbit_exec_prefix"
-    then
-      fs_dirs=fs
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT(disabled because ORBIT, the CORBA ORB, was not found)
-    fi
-  else
-    AC_MSG_RESULT([no])
-  fi
-  AC_SUBST([fs_dirs])
-])
-
-AC_DEFUN([MYSQL_CHECK_ORBIT], [
-AC_MSG_CHECKING(for ORBit)
-orbit_config_path=`which orbit-config`
-if test -n "$orbit_config_path" -a $? = 0
-then
-  orbit_exec_prefix=`orbit-config --exec-prefix`
-  orbit_includes=`orbit-config --cflags server`
-  orbit_libs=`orbit-config --libs server`
-  orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
-  AC_MSG_RESULT(found!)
-  AC_DEFINE([HAVE_ORBIT], [1], [ORBIT])
-else
-  orbit_exec_prefix=
-  orbit_includes=
-  orbit_libs=
-  orbit_idl=
-  AC_MSG_RESULT(not found)
-fi
-AC_SUBST(orbit_includes)
-AC_SUBST(orbit_libs)
-AC_SUBST(orbit_idl)
-])

configure.in

@@ -45,7 +45,6 @@ sinclude(config/ac-macros/ha_ndbcluster.m4)
 sinclude(config/ac-macros/ha_tina.m4)
 sinclude(config/ac-macros/large_file.m4)
 sinclude(config/ac-macros/misc.m4)
-sinclude(config/ac-macros/mysqlfs.m4)
 sinclude(config/ac-macros/openssl.m4)
 sinclude(config/ac-macros/readline.m4)
 sinclude(config/ac-macros/zlib.m4)
@@ -580,18 +579,6 @@ AC_ARG_WITH(server-suffix,
     )
 AC_SUBST(MYSQL_SERVER_SUFFIX)
 
-# Set flags if we wants to have MIT threads.
-AC_ARG_WITH(mit-threads,
-    [  --with-mit-threads      Always use included thread lib.],
-    [ with_mit_threads=$withval ],
-    [ with_mit_threads=no ]
-    )
-
-if test "$with_mit_threads" = "yes"
-then
-  enable_largefile="no"		# Will not work on Linux.
-fi
-
 # Set flags if we want to force to use pthreads
 AC_ARG_WITH(pthread,
     [  --with-pthread          Force use of pthread library.],
@@ -648,20 +635,6 @@ else
 fi
 
 
-AC_MSG_CHECKING(if we should use RAID)
-AC_ARG_WITH(raid,
-    [  --with-raid             Enable RAID Support],
-    [   USE_RAID=$withval ],
-    [   USE_RAID=no ]
-    )
-if test "$USE_RAID" = "yes"
-then
-  AC_MSG_RESULT([yes])
-  AC_DEFINE([USE_RAID], [1], [Use MySQL RAID])
-else
-  AC_MSG_RESULT([no])
-fi
-
 # Use this to set the place used for unix socket used to local communication.
 AC_ARG_WITH(unix-socket-path,
     [  --with-unix-socket-path=SOCKET
@@ -856,7 +829,7 @@ int main()
     [ USE_PSTACK=no ])
   pstack_libs=
   pstack_dirs=
-  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386" -a "$with_mit_threads" = "no"
+  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"
   then
     have_libiberty= have_libbfd=
     my_save_LIBS="$LIBS"
@@ -1239,7 +1212,7 @@ esac
 
 with_posix_threads="no"
 # Hack for DEC-UNIX (OSF1)
-if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
+if test "$with_named_thread" = "no"
 then
   # Look for LinuxThreads.
   AC_MSG_CHECKING("LinuxThreads")
@@ -1470,7 +1443,7 @@ then
 fi
 
 # Hack for Siemens UNIX
-if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
+if test "$with_named_thread" = "no"
 then
   AC_MSG_CHECKING("Siemens threads")
   if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4"
@@ -1498,7 +1471,7 @@ fi
 # Hack for Solaris >= 2.5
 # We want both the new and the old interface
  
-if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
+if test "$with_named_thread" = "no"
 then
   AC_MSG_CHECKING("Solaris threads")
   if test -f /usr/lib/libpthread.so -a -f /usr/lib/libthread.so
@@ -1516,12 +1489,9 @@ if test "$with_named_thread" != "no"
 then
   LIBS="$with_named_thread $LIBS $with_named_thread"
   with_posix_threads="yes"
-  with_mit_threads="no"
   AC_MSG_RESULT("$with_named_thread")
 else
   AC_MSG_RESULT("no")
-  if test "$with_mit_threads" = "no"
-  then
   # pthread_create is in standard libraries (As in BSDI 3.0)
   AC_MSG_CHECKING("for pthread_create in -libc");
   AC_TRY_LINK(
@@ -1558,12 +1528,6 @@ else
         [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
         with_posix_threads=yes, with_posix_threads=no)
         AC_MSG_RESULT("$with_posix_threads")
-          if test "$with_posix_threads" = "no"
-	  then
-	    with_mit_threads="yes"
-	    LIBS="$ac_save_LIBS"
-	  fi
-	fi
       fi
     fi
   fi
@@ -2048,11 +2012,9 @@ then
 fi
 
 
-if test "$with_mit_threads" = "no"
-then
-  # Check definition of pthread_getspecific
-  AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args,
-  AC_TRY_COMPILE(
+# Check definition of pthread_getspecific
+AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args,
+AC_TRY_COMPILE(
 [#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
 #define _REENTRANT
 #endif
@@ -2085,7 +2047,6 @@ mysql_cv_mutex_init_args=POSIX, mysql_cv_mutex_init_args=other))
     AC_DEFINE([HAVE_NONPOSIX_PTHREAD_MUTEX_INIT], [1],
               [For some non posix threads])
   fi
-fi
 #---END:
 
 #---START: Used in for client configure
@@ -2262,7 +2223,6 @@ AC_ARG_WITH([mysqlmanager],
 AC_SUBST(tools_dirs)
 
 #MYSQL_CHECK_CPU
-MYSQL_CHECK_MYSQLFS
 MYSQL_CHECK_VIO
 MYSQL_CHECK_OPENSSL
 
@@ -2577,28 +2537,6 @@ esac
   #
   sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
 
-  if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"
-  then
-    # MIT user level threads
-    thread_dirs="mit-pthreads"
-    AC_DEFINE([HAVE_mit_thread], [1], [Do we use user level threads])
-    MT_INCLUDES="-I\$(top_srcdir)/mit-pthreads/include"
-    AC_SUBST(MT_INCLUDES)
-    if test -n "$OVERRIDE_MT_LD_ADD"
-    then 
-      MT_LD_ADD="$OVERRIDE_MT_LD_ADD"
-    else
-      MT_LD_ADD="-L \$(top_srcdir)/mit-pthreads/obj/ -lpthread"
-    fi
-    AC_SUBST(MT_LD_ADD)
-    echo ""
-    echo "Configuring MIT Pthreads"
-    # We will never install so installation paths are not needed.
-    (cd mit-pthreads && sh ./configure) || exit 1
-    echo "End of MIT Pthreads configuration"
-    echo ""
-    LIBS="$MT_LD_ADD $LIBS"
-  fi
 fi
 
 # IMPORTANT - do not modify LIBS past this line - this hack is the only way
@@ -2626,12 +2564,6 @@ do
 done
 AC_SUBST(sql_union_dirs)
 
-#if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"
-#then
-  # MIT pthreads does now support connecting with unix sockets
-  # AC_DEFINE([HAVE_THREADS_WITHOUT_SOCKETS], [], [MIT pthreads does not support connecting with unix sockets])
-#fi
-
 # Some usefull subst
 AC_SUBST(CC)
 AC_SUBST(GXX)

dbug/Makefile.am

@@ -15,7 +15,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-INCLUDES =              @MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =              -I$(top_srcdir)/include
 LDADD =                 libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a
 pkglib_LIBRARIES =      libdbug.a
 noinst_HEADERS =        dbug_long.h

extra/Makefile.am

@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include \
+INCLUDES =		-I$(top_srcdir)/include \
 			@ndbcluster_includes@ -I$(top_srcdir)/sql \
 			-I$(top_builddir)/include
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \

heap/Makefile.am

@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include 
+INCLUDES =		-I$(top_srcdir)/include 
 LDADD =			libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \
 			../strings/libmystrings.a
 pkglib_LIBRARIES =	libheap.a

libmysql_r/Makefile.am

@@ -24,8 +24,7 @@ target = libmysqlclient_r.la
 target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
 LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
 
-INCLUDES = @MT_INCLUDES@ \
-	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
+INCLUDES = -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \
 		-I$(top_builddir)/include
 ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
 include $(top_srcdir)/libmysql/Makefile.shared

libmysqld/Makefile.am

@@ -25,7 +25,7 @@ DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\""
-INCLUDES=		@MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \
+INCLUDES=		@bdb_includes@ -I$(top_srcdir)/include \
 			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \
 			-I$(top_srcdir)/regex \
 			-I$(top_builddir)/include \

myisam/Makefile.am

@@ -17,7 +17,7 @@
 EXTRA_DIST =		mi_test_all.sh mi_test_all.res
 pkgdata_DATA =		mi_test_all mi_test_all.res
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		-I$(top_srcdir)/include
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \

myisammrg/Makefile.am

@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		-I$(top_srcdir)/include
 pkglib_LIBRARIES =	libmyisammrg.a
 noinst_HEADERS =	myrg_def.h
 libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \

mysys/Makefile.am

@@ -17,8 +17,7 @@
 MYSQLDATAdir =		$(localstatedir)
 MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
-INCLUDES =		@MT_INCLUDES@ \
-                        @ZLIB_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir)
+INCLUDES =		@ZLIB_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir)
 pkglib_LIBRARIES =	libmysys.a
 LDADD =			libmysys.a ../dbug/libdbug.a \
 			../strings/libmystrings.a

regex/Makefile.am

@@ -15,7 +15,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		-I$(top_srcdir)/include
 noinst_LIBRARIES =	libregex.a
 LDADD=			libregex.a $(top_builddir)/strings/libmystrings.a
 noinst_HEADERS =	cclass.h cname.h regex2.h utils.h engine.c regex.h

sql/Makefile.am

@@ -19,7 +19,7 @@
 MYSQLDATAdir =		$(localstatedir)
 MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
-INCLUDES =		@MT_INCLUDES@ @ZLIB_INCLUDES@ \
+INCLUDES =		@ZLIB_INCLUDES@ \
 			@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
 			-I$(top_srcdir)/include -I$(top_srcdir)/regex \
 			-I$(srcdir) $(openssl_includes) -I$(top_builddir)/include

strings/Makefile.am

@@ -16,7 +16,7 @@
 
 # This file is public domain and comes with NO WARRANTY of any kind
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		-I$(top_srcdir)/include
 pkglib_LIBRARIES =	libmystrings.a
 
 # Exact one of ASSEMBLER_X

tests/Makefile.am

@@ -46,7 +46,7 @@ select_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 DEFS =			-DUNDEF_THREADS_HACK
 
 thread_test.o:		thread_test.c
-			$(COMPILE) -c @MT_INCLUDES@ $(INCLUDES) $<
+			$(COMPILE) -c $(INCLUDES) $<
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

tools/Makefile.am

@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # Process this file with automake to create Makefile.in
 
-INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) \
+INCLUDES=-I$(top_srcdir)/include $(openssl_includes) \
 	-I$(top_builddir)/include
 LDADD=  @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \
 	$(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@