Commit d5b75475 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1
parents 9c642e5b 12169860

mysql-test/Makefile.am

+10 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ endif 


benchdir_root=		$(prefix)

testdir =	        $(benchdir_root)/mysql-test

EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh

EXTRA_SCRIPTS = 	mysql-test-run.sh mysql-test-run.pl install_test_db.sh

EXTRA_DIST = 		$(EXTRA_SCRIPTS) 

test_SCRIPTS = 		mysql-test-run install_test_db 

test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
@@ -46,7 +46,7 @@ mysql_test_run_new_SOURCES= mysql_test_run_new.c my_manage.c my_create_tables.c 


dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data

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

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

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

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(srcdir)/r/*.require $(distdir)/r
@@ -54,6 +54,8 @@ 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)/lib/init_db.sql $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib





install-data-local:
@@ -61,7 +63,8 @@ install-data-local: 
		$(DESTDIR)$(testdir)/t \

		$(DESTDIR)$(testdir)/r \

		$(DESTDIR)$(testdir)/include \

		$(DESTDIR)$(testdir)/std_data

		$(DESTDIR)$(testdir)/std_data \

		$(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)

	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t
@@ -75,6 +78,8 @@ install-data-local: 
	$(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

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib



std_data/%.pem:

	@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

mysql-test/mysql-test-run.pl

+0 −1
Original line number Diff line number Diff line
@@ -635,7 +635,6 @@ sub command_line_setup () { 
    {

      mtr_error("Can't use --extern with --embedded-server");

    }

    $opt_result_ext=  ".es";

  }



  # FIXME don't understand what this is

mysql-test/r/rpl_rewrite_db.result

+1 −0
Original line number Diff line number Diff line
@@ -89,4 +89,5 @@ a b 
2	row 2

3	row 3

0	

drop database rewrite;

drop table t1;

mysql-test/t/rpl_rewrite_db.test

+3 −0
Original line number Diff line number Diff line
@@ -73,5 +73,8 @@ connection slave; 
# The empty line last comes from the end line field in the file

select * from rewrite.t1;



drop database rewrite;



connection master;

drop table t1;