Commit dd39e9fa authored by unknown's avatar unknown
Browse files

Merge mysqldev@win2003-x86:my/mysql-5.1-new 

into  mysql.com:/usr/local/mysql/mysql-5.1-win-src


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
parents 9d9ac1b0 7b3c889f

Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign 


# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \

			README COPYING EXCEPTIONS-CLIENT

			README COPYING EXCEPTIONS-CLIENT cmakelists.txt

SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \
@@ -29,7 +29,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ 
			@mysql_se_plugins@ \

			netware @libmysqld_dirs@ \

			@bench_dirs@ support-files @tools_dirs@ \

			plugin

			plugin win



DIST_SUBDIRS =		. include @docs_dirs@ zlib \

			@readline_topdir@ sql-common \
@@ -39,7 +39,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ 
			@man_dirs@ tests SSL\

			BUILD netware os2 @libmysqld_dirs@\

			@bench_dirs@ support-files server-tools tools \

			plugin

			plugin win



# Run these targets before any others, also make part of clean target,

# to make sure we create new links after a clean.

client/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ strings_src=decimal.c 


# Fix for mit-threads

DEFS =			-DUNDEF_THREADS_HACK

EXTRA_DIST =		get_password.c cmakelists.txt



link_sources:

	for f in $(sql_src) ; do \

cmakelists.txt

+13 −3
Original line number Diff line number Diff line 
PROJECT(MySql)



EXEC_PROGRAM(cscript.exe win ARGS config-version.js OUT_VARIABLE out)

EXEC_PROGRAM(cscript.exe ${PROJECT_SOURCE_DIR}/win

             ARGS config-version.js ${PROJECT_SOURCE_DIR}/win/configure.data

             OUTPUT_VARIABLE out)

STRING(REGEX REPLACE ".*DEFINITIONS@ *([^@]*)@.*" \\1 cfg_def ${out})

STRING(REGEX REPLACE ".*HANDLERTONS@ *([^@]*)@.*" \\1 handlertons ${out})

SEPARATE_ARGUMENTS(handlertons)

STRING(REGEX REPLACE ".*DEPENDS@ *([^@]*)@.*" \\1 se_deps ${out})

SEPARATE_ARGUMENTS(se_deps)

STRING(REGEX REPLACE ".*SUBDIRS@ *([^@]*)@.*" \\1 se_subdirs ${out})

SEPARATE_ARGUMENTS(se_subdirs)

ADD_DEFINITIONS(${cfg_def})



# in some places we use DBUG_OFF

SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")
@@ -32,5 +42,5 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu 
ADD_DEFINITIONS("-D_WINDOWS -D__WIN__")



SUBDIRS(vio dbug strings regex mysys extra/yassl extra/yassl/taocrypt extra 

        zlib storage/innobase storage/heap storage/myisam storage/myisammrg 

		client sql server-tools/instance-manager libmysql tests)
 
        zlib storage/heap storage/myisam storage/myisammrg client 

	${se_subdirs} sql server-tools/instance-manager libmysql tests)

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -2618,7 +2618,8 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl 
 zlib/Makefile dnl

 cmd-line-utils/readline/Makefile dnl

 plugin/Makefile dnl

 plugin/fulltext/Makefile)

 plugin/fulltext/Makefile dnl

 win/Makefile)

 AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)

 AC_OUTPUT

extra/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h 
bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid innochecksum

noinst_PROGRAMS =	charset2html

EXTRA_DIST =		cmakelists.txt



perror.o: perror.c 

	$(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<