Commit f2dee68c authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents b066c120 7c1d25d9

configure.in

+12 −4
Original line number Diff line number Diff line
@@ -100,14 +100,22 @@ AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"], 




# Canonicalize the configuration name.

SYSTEM_TYPE="$host_vendor-$host_os"

MACHINE_TYPE="$host_cpu"



# Check whether --with-system-type or --without-system-type was given.

AC_ARG_WITH(system-type,

    [  --with-system-type      Set the system type, like "sun-solaris10"],

    [SYSTEM_TYPE="$withval"],

    [SYSTEM_TYPE="$host_vendor-$host_os"])

AC_ARG_WITH(machine-type,

    [  --with-machine-type     Set the machine type, like "powerpc"],

    [MACHINE_TYPE="$withval"],

    [MACHINE_TYPE="$host_cpu"])

AC_SUBST(SYSTEM_TYPE)

AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"],

                   [Name of system, eg solaris])

                   [Name of system, eg sun-solaris])

AC_SUBST(MACHINE_TYPE)

AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"],

                   [Machine type name, eg sun10])

                   [Machine type name, eg sparc])



# Detect intel x86 like processor

BASE_MACHINE_TYPE=$MACHINE_TYPE

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ testdir = $(benchdir_root)/mysql-test 
EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)

EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite

GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr

PRESCRIPTS =		mysql-test-run.pl

PRESCRIPTS =		mysql-test-run.pl mysql-stress-test.pl

test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)

test_DATA = 		std_data/client-key.pem \

			std_data/client-cert.pem \

scripts/make_binary_distribution.sh

+2 −1
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD 
copyfileto $BASE/mysql-test \

         mysql-test/mysql-test-run mysql-test/install_test_db \

         mysql-test/mysql-test-run.pl mysql-test/README \

         mysql-test/mysql-stress-test.pl \

         mysql-test/valgrind.supp \

         netware/mysql_test_run.nlm netware/install_test_db.ncf

server-tools/instance-manager/listener.cc

+3 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class Listener_thread: public Listener_thread_args 
  ~Listener_thread();

  void run();

private:

  static const int LISTEN_BACK_LOG_SIZE= 5;     /* standard backlog size */

  static const int LISTEN_BACK_LOG_SIZE;

  ulong total_connection_count;

  Thread_info thread_info;
@@ -80,6 +80,8 @@ class Listener_thread: public Listener_thread_args 
  int   create_unix_socket(struct sockaddr_un &unix_socket_address);

};



const int Listener_thread::LISTEN_BACK_LOG_SIZE = 5; /* standard backlog size */





Listener_thread::Listener_thread(const Listener_thread_args &args) :

  Listener_thread_args(args.thread_registry, args.options, args.user_map,

sql/CMakeLists.txt

+9 −7
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ IF(DISABLE_GRANT_OPTIONS) 
  ADD_DEFINITIONS(-DDISABLE_GRANT_OPTIONS)

ENDIF(DISABLE_GRANT_OPTIONS)



ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc

ADD_EXECUTABLE(mysqld${MYSQLD_EXE_SUFFIX}

	       ../sql-common/client.c derror.cc des_key_file.cc

               discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 

               filesort.cc gstream.cc ha_blackhole.cc 

               ha_archive.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc
@@ -82,7 +83,8 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc 
			   ${PROJECT_SOURCE_DIR}/include/mysql_version.h 

			   ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)



TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl 

TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX}

		      heap myisam myisammrg mysys yassl zlib dbug yassl 

                      taocrypt strings vio regex wsock32)



IF(EMBED_MANIFESTS)
@@ -90,19 +92,19 @@ IF(EMBED_MANIFESTS) 
ENDIF(EMBED_MANIFESTS)



IF(WITH_EXAMPLE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld example)

  TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} example)

ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)



IF(WITH_INNOBASE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld innobase)

  TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)



IF(WITH_BERKELEY_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld bdb)

  TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)





ADD_DEPENDENCIES(mysqld GenError)

ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} GenError)



# Sql Parser custom command

ADD_CUSTOM_COMMAND(
@@ -134,7 +136,7 @@ ADD_CUSTOM_COMMAND( 
	COMMAND ${GEN_LEX_HASH_EXE} ARGS > lex_hash.h

	DEPENDS ${GEN_LEX_HASH_EXE}

)

ADD_DEPENDENCIES(mysqld gen_lex_hash)

ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} gen_lex_hash)



ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)

ADD_DEPENDENCIES(udf_example strings)