Commit fa780d44 authored by unknown's avatar unknown
Browse files

Manual merge. 


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
parents 73970add 421ae80b

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

+2 −2
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu 
ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")



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
@@ -2620,7 +2620,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

dbug/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a 
pkglib_LIBRARIES =      libdbug.a

noinst_HEADERS =        dbug_long.h

libdbug_a_SOURCES =     dbug.c sanity.c

EXTRA_DIST =            example1.c example2.c example3.c \

EXTRA_DIST =            cmakelists.txt example1.c example2.c example3.c \

                        user.r monty.doc dbug_add_tags.pl \

                        my_main.c main.c factorial.c dbug_analyze.c

NROFF_INC =             example1.r example2.r example3.r main.r \