Commit b3a67405 authored by unknown's avatar unknown
Browse files

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0


sql/mysql_priv.h:
  Auto merged
parents 8ae06808 15062e97

BUILD/compile-pentium64-debug-max

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



path=`dirname $0`

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium64_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_configs"



extra_configs="$extra_configs "



. "$path/FINISH.sh"

Makefile.am

+12 −9
Original line number Diff line number Diff line
@@ -85,15 +85,18 @@ tags: 
	support-files/build-tags

.PHONY:		init-db bin-dist



# Test installation. Ports are configurable from the environment.



MYSQL_TEST_MANAGER_PORT =	9305

MYSQL_TEST_MASTER_PORT =	9306

MYSQL_TEST_SLAVE_PORT =		9308

# Target 'test' will run the regression test suite using the built server.

#

# If you are running in a shared environment, users can avoid clashing

# port numbers by setting individual small numbers 1-100 to the

# environment variable MTR_BUILD_THREAD. The script "mysql-test-run"

# will then calculate the various port numbers it needs from this,

# making sure each user use different ports.



test:

	cd mysql-test ; \

	./mysql-test-run \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT)
 
	./mysql-test-run



test-force:

	cd mysql-test ; \

	./mysql-test-run --force

NEW-RPMS/.cvsignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
MySQL-*.rpm

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -2202,10 +2202,14 @@ AC_ARG_WITH(man, 
if test "$with_man" = "yes"

then

  man_dirs="man"

  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

  man1_files=`echo $man1_files`

else

  man_dirs=""

  man1_files=""

fi

AC_SUBST(man_dirs)

AC_SUBST(man1_files)



# Shall we build the bench code?

AC_ARG_WITH(bench,

include/config-netware.h

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ extern "C" { 
#undef HAVE_SCHED_H

#undef HAVE_SYS_MMAN_H

#undef HAVE_SYNCH_H

#undef HAVE_RINT

#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1

#define HAVE_PTHREAD_SIGMASK 1

#define HAVE_PTHREAD_YIELD_ZERO_ARG 1
@@ -91,6 +92,9 @@ extern "C" { 
/* On NetWare, stack grows towards lower address*/

#define STACK_DIRECTION -1



/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1



/* default directory information */

#define	DEFAULT_MYSQL_HOME    "sys:/mysql"

#define PACKAGE               "mysql"