Commit 6cf16daa authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/my41-bug21125 

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents def55c52 568b49fb

mysql-test/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
@@ -83,6 +84,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data

scripts/make_win_src_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ copy_dir_files() 
    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.yy \

             README INSTALL* LICENSE AUTHORS NEWS ChangeLog \

             *.inc *.test *.result *.pem Moscow_leap des_key_file \

             *.vcproj *.sln *.dat *.000001 *.require *.opt

             *.vcproj *.sln *.dat *.000001 *.require *.opt *.cnf

    do

      if [ -f $i ]

      then