Commit da7016ee authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents 2a2f219c ddb679ed

Makefile.am

+13 −11
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ BUILT_SOURCES = linked_client_sources linked_server_sources \ 
CLEANFILES = $(BUILT_SOURCES)

DISTCLEANFILES = ac_available_languages_fragment



# Our current filtering of "sql_yacc.cc" in "sql/Makefile.am" creates

# a problem, if a VPATH build and "sql_yacc.cc" was part of the source

# distribution we end up with one "sql_yacc.cc" in the source tree,

# and one in the build tree. This breaks "distcleancheck", until this

# is sorted out we redefine the find that scans for files not removed



distcleancheck_listfiles = find . -name sql_yacc.cc -o -type f -print



linked_include_sources:

	cd include; $(MAKE) link_sources

	echo timestamp > linked_include_sources
@@ -86,17 +94,11 @@ bin-dist: all 
dist-hook:

	rm -rf `find $(distdir) -type d -name SCCS -print`

	rm -f  `find $(distdir) -type l -print`

	if echo "$(distdir)" | grep -q '^/' ; then \

          mkdir -p "$(distdir)/win" ; \

	  scripts/mysql_install_db --no-defaults --windows \

		--basedir=$(top_srcdir) \

		--datadir="$(distdir)/win/data"; \

	else \

          mkdir -p "$$(pwd)/$(distdir)/win" ; \

	mkdir -p $(distdir)/win

	scripts/mysql_install_db --no-defaults --windows \

		 --basedir=$(top_srcdir) \

		 --datadir="$$(pwd)/$(distdir)/win/data"; \

	fi

		--basedir=$(top_builddir) \

		--datadir=$(distdir)/win/data \

		--srcdir=$(top_srcdir)



tags:

	support-files/build-tags

include/Makefile.am

+11 −11
Original line number Diff line number Diff line
@@ -15,14 +15,18 @@ 
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



BUILT_SOURCES =		mysql_version.h my_config.h

pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \

			mysql.h mysql_com.h mysql_embed.h \

# FIXME 'abi_check' should be in BUILT_SOURCES, disabled for now

BUILT_SOURCES =		$(HEADERS_GEN)

HEADERS_GEN =		mysql_version.h my_config.h

HEADERS_ABI =		mysql.h mysql_com.h mysql_time.h \

			my_list.h my_alloc.h typelib.h

pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \

			my_xml.h mysql_embed.h \

		  	my_semaphore.h my_pthread.h my_no_pthread.h \

			errmsg.h my_global.h my_net.h my_alloc.h \

			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \

			errmsg.h my_global.h my_net.h \

			my_getopt.h sslopt-longopts.h my_dir.h \

			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			mysql_time.h m_ctype.h mysql/plugin.h $(BUILT_SOURCES)

			m_ctype.h mysql/plugin.h $(HEADERS_GEN)

noinst_HEADERS =	config-win.h config-netware.h \

			heap.h my_bitmap.h my_uctype.h \

			myisam.h myisampack.h myisammrg.h ft_global.h\
@@ -61,8 +65,7 @@ dist-hook: 
#



# Create a icheck file and compare it to the reference

abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \

           my_alloc.h typelib.h mysql_h.ic

abi_check: $(HEADERS_ABI) mysql_version.h mysql_h.ic

	@set -ex; \

	if [ @ICHECK@ != no ] ; then \

	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \
@@ -70,8 +73,5 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ 
	fi; \

	touch abi_check;



#all: abi_check





# Don't update the files from bitkeeper

%::SCCS/s.%

include/m_ctype.h

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ int my_wildcmp_unicode(CHARSET_INFO *cs, 
extern my_bool my_parse_charset_xml(const char *bug, uint len,

				    int (*add)(CHARSET_INFO *cs));

extern char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end,

                       char c);

                       pchar c);



my_bool my_propagate_simple(CHARSET_INFO *cs, const uchar *str, uint len);

my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, uint len);

netware/BUILD/nwbootstrap

+1 −2
Original line number Diff line number Diff line
@@ -172,8 +172,7 @@ nlm_version=`echo "$version" | sed -e "s;\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*;\1 
for file in ./netware/*.def

do

  mv -f $file $file.org

  sed -e "s;VERSION.*;VERSION $nlm_version;g" \

      -e "s;XDCDATA.*;XDCDATA $SRC_DIR/netware/mysql.xdc;g" $file.org > $file

  sed -e "s;VERSION.*;VERSION $nlm_version;g" $file.org > $file

  rm $file.org

done

netware/Makefile.am

+5 −2
Original line number Diff line number Diff line
@@ -30,8 +30,9 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ 
                                client/mysqlbinlog.def client/mysqlcheck.def \

                                client/mysqldump.def client/mysqlimport.def \

                                client/mysqlshow.def client/mysqltest.def \

                                client/mysqlslap.def \

                                client/mysqlslap.def client/mysql_upgrade.def \

                                sql/mysqld.def extra/mysql_waitpid.def \

				tests/mysql_client_test.def \

                                extra/my_print_defaults.def \

                                extra/perror.def extra/replace.def \

                                extra/resolveip.def extra/comp_err.def \
@@ -73,7 +74,9 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \ 
		mysql_test_run.def mysql_waitpid.def mysqladmin.def \

		mysqlbinlog.def mysqlcheck.def mysqld.def \

		mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \

		mysqlshow.def mysqltest.def mysqlslap.def perror.def \

		mysqlshow.def mysqltest.def mysqlslap.def mysql_upgrade.def \

		perror.def \

		mysql_client_test.def \

		replace.def resolve_stack_dump.def resolveip.def test_db.sql \

		static_init_db.sql \

		BUILD/apply-patch BUILD/compile-AUTOTOOLS \