Commit 6a89fbd2 authored by tonu@x3.internalnet's avatar tonu@x3.internalnet
Browse files

Merge work.mysql.com:/home/bk/mysql-4.0 

into x3.internalnet:/home/tonu/bk/mysql-4.0-modified
parents a3be64bf b8670d48

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ monty@donna.mysql.fi 
monty@work.mysql.com

mwagner@evoq.mwagner.org

paul@central.snake.net

root@x3.internalnet

sasha@mysql.sashanet.com

serg@serg.mysql.com

tim@threads.polyesthetic.msg

tim@work.mysql.com

tonu@x3.internalnet

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ TAR = gtar 
EXTRA_DIST =		INSTALL-SOURCE README \

			COPYING COPYING.LIB MIRRORS

SUBDIRS =		include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ @pstack_dirs@ @sql_client_dirs@ \

			@thread_dirs@ @pstack_dirs@ vio @sql_client_dirs@ \

			@sql_server_dirs@ @libmysqld_dirs@ scripts tests man \

			@bench_dirs@ support-files @fs_dirs@

acconfig.h

+6 −0
Original line number Diff line number Diff line
@@ -163,9 +163,15 @@ 
/* new UNIXWARE7 threads that are not yet posix */

#undef HAVE_UNIXWARE7_POSIX



/* OpenSSL */

#undef HAVE_OPENSSL



/* READLINE: */

#undef HAVE_USG_SIGHOLD



/* Virtual IO */

#undef HAVE_VIO



/* Handling of large files on Solaris 2.6 */

#undef _LARGEFILE_SOURCE

acinclude.m4

+51 −0
Original line number Diff line number Diff line
@@ -642,6 +642,57 @@ fi 
AC_MSG_RESULT($ac_cv_conv_longlong_to_float)

])



AC_DEFUN(MYSQL_CHECK_VIO, [

  AC_ARG_WITH([vio],

              [\

  --with-vio          Include the Virtual IO support],

              [vio="$withval"],

              [vio=no])



  if test "$vio" = "yes"

  then

    vio_dir="vio"

    vio_libs="../vio/libvio.la"

    AC_DEFINE(HAVE_VIO)

  else

    vio_dir=""

    vio_libs=""

  fi

  AC_SUBST([vio_dir])

  AC_SUBST([vio_libs])

])





AC_DEFUN(MYSQL_CHECK_OPENSSL, [

AC_MSG_CHECKING(for OpenSSL)

  AC_ARG_WITH([openssl],

              [\

  --with-openssl          Include the OpenSSL support],

              [openssl="$withval"],

              [openssl=no])



  if test "$openssl" = "yes"

  then

    if test -n "$vio_dir"

    then

      AC_MSG_RESULT(yes)

      openssl_libs="-lssl -lcrypto -L/usr/local/ssl/lib"

      openssl_includes="-I/usr/local/ssl/include"

    else

      AC_MSG_ERROR([OpenSSL requires Virtual IO support (--with-vio)])

    fi

    AC_DEFINE(HAVE_OPENSSL)

  else

    AC_MSG_RESULT(no)

    openssl_libs=""

    openssl_includes=""

  fi

  NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"

  AC_SUBST([openssl_libs])

  AC_SUBST([openssl_includes])

])





AC_DEFUN(MYSQL_CHECK_MYSQLFS, [

  AC_ARG_WITH([mysqlfs],

              [\

sql/Makefile.am

+5 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ INCLUDES = @MT_INCLUDES@ \ 
			@bdb_includes@ @innodb_includes@ @gemini_includes@ \

			-I$(srcdir)/../include \

			-I$(srcdir)/../regex \

			-I$(srcdir) -I../include -I.. -I.

			-I$(srcdir) -I../include -I.. -I. $(openssl_includes)

WRAPLIBS=		@WRAPLIBS@

SUBDIRS =		share

bin_PROGRAMS	=	mysqlbinlog
@@ -39,11 +39,12 @@ LDADD = ../isam/libnisam.a \ 
			../mysys/libmysys.a \

			../dbug/libdbug.a \

			../regex/libregex.a \

			../vio/libvio.a \

			../strings/libmystrings.a

mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \

			@bdb_libs@ @innodb_libs@ @pstack_libs@ \

                        @gemini_libs@ \

			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@

			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ @openssl_libs@

noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \

			item_strfunc.h item_timefunc.h item_uniq.h \

			item_create.h mysql_priv.h \
@@ -62,7 +63,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ 
			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \

			thr_malloc.cc item_create.cc \

			field.cc key.cc sql_class.cc sql_list.cc \

			net_serv.cc violite.c net_pkg.cc lock.cc my_lock.c \

			net_serv.cc net_pkg.cc lock.cc my_lock.c \

			sql_string.cc sql_manager.cc sql_map.cc \

			mysqld.cc password.c hash_filo.cc hostname.cc \

			convert.cc sql_parse.cc sql_yacc.yy \
@@ -85,7 +86,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ 
gen_lex_hash_SOURCES =	gen_lex_hash.cc

gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)

mysqlbinlog_SOURCES =   mysqlbinlog.cc mini_client.cc net_serv.cc \

			mini_client_errors.c violite.c password.c

			mini_client_errors.c password.c

mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) $(mysqld_LDADD)



DEFS =			-DMYSQL_SERVER \