Commit 593e7ab4 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Ugly merge of 3.23 changes into 4.0 - fix up needed

parents 95d908dd 8f62579c

BUILD/compile-pentium-mysqlfs-debug

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs --with-debug=full --with-mysqlfs --without-server --without-pstack"



. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
heikki@donna.mysql.fi

monty@donna.mysql.fi

monty@work.mysql.com

sasha@mysql.sashanet.com

Makefile.am

+12 −5
Original line number Diff line number Diff line
@@ -22,15 +22,18 @@ TAR = gtar 
EXTRA_DIST =		INSTALL-SOURCE README \

			COPYING COPYING.LIB MIRRORS

SUBDIRS =		include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ @sql_client_dirs@ \

			@sql_server_dirs@ scripts tests man \

			@bench_dirs@ support-files

			@thread_dirs@ @pstack_dirs@ @sql_client_dirs@ \

			@sql_server_dirs@ @libmysqld_dirs@ scripts tests man \

			@bench_dirs@ support-files @fs_dirs@



# Relink after clean

CLEANFILES =		linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

linked_sources = linked_client_sources linked_server_sources \

		 linked_libmysql_sources linked_libmysql_r_sources \

		 linked_libmysqld_sources linked_include_sources

CLEANFILES = $(linked_sources)



# This is just so that the linking is done early.

config.h:	linked_include_sources linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources

config.h: $(linked_sources)



linked_include_sources:

	cd include; $(MAKE) link_sources
@@ -47,6 +50,10 @@ linked_libmysql_r_sources: linked_libmysql_sources 
	cd libmysql_r; $(MAKE) link_sources

	echo timestamp > linked_libmysql_r_sources



linked_libmysqld_sources:

	cd libmysqld; $(MAKE) link_sources

	echo timestamp > linked_libmysqld_sources



#avoid recursive make calls in sql directory

linked_server_sources:

	cd sql; rm -f mini_client_errors.c;@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c

acconfig.h

+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ 
/* sigwait with one argument */

#undef HAVE_NONPOSIX_SIGWAIT



/* ORBIT */

#undef HAVE_ORBIT



/* pthread_attr_setscope */

#undef HAVE_PTHREAD_ATTR_SETSCOPE
@@ -230,6 +233,9 @@ 
#undef USE_MB

#undef USE_MB_IDENT



/* the pstack backtrace library */

#undef USE_PSTACK



/* Use MySQL RAID */

#undef USE_RAID

acinclude.m4

+47 −0
Original line number Diff line number Diff line
@@ -605,6 +605,53 @@ fi 
AC_MSG_RESULT($ac_cv_conv_longlong_to_float)

])



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



  if test "$mysqlfs" = "yes"

  then

    if test -n "$orbit_exec_prefix"

    then

      fs_dirs=fs

    else

      AC_MSG_ERROR([mysqlfs requires ORBit, the CORBA ORB])

    fi

  else

    fs_dirs=

  fi

  AC_SUBST([fs_dirs])

])



AC_DEFUN(MYSQL_CHECK_ORBIT, [

AC_MSG_CHECKING(for ORBit)

if test `which orbit-config`

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)

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)

])



dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_BDB

dnl Sets HAVE_BERKELEY_DB if inst library is found