Commit 595f63b3 authored by unknown's avatar unknown
Browse files

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/space/my/mysql-5.0
parents d1e9ff36 8e0760e7

include/config-win.h

+0 −1
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ inline double ulonglong2double(ulonglong value) 
/* #undef HAVE_CHARSET_armscii8 */

/* #undef HAVE_CHARSET_ascii */

#define HAVE_CHARSET_big5 1

#define HAVE_CHARSET_cp932

#define HAVE_CHARSET_cp1250 1

/* #undef HAVE_CHARSET_cp1251 */

/* #undef HAVE_CHARSET_cp1256 */

mysql-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ dist-hook: 
	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include