Commit ec135941 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

fixed up mysql-test - will not push this yet, as more clean up/testing is to follow

parent a5c75df3

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -401,3 +401,5 @@ mysql-test/var/lib/test/test2.MYI 
mysql-test/var/run/mysqld.pid

mysql-test/var/tmp/mysql.sock

mysql-test/var/lib/mysql-bin.008

libmysql_r/hash.c

scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz

BitKeeper/etc/gone

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ mwagner@evoq.home.mwagner.org|mysql-test/var/log/README|20001009213643|16203|df5 
mwagner@evoq.home.mwagner.org|mysql-test/var/run/README|20001009213643|17062|acb305e4c2ed5990

mwagner@evoq.home.mwagner.org|mysql-test/var/tmp/README|20001009213643|17904|b32d866bfd50e72e

mwagner@evoq.home.mwagner.org|mysql-test/share/README|20001009213643|10987|6cd25db633f30de5

mwagner@evoq.home.mwagner.org|mysql-test/r/3.23/README|20001009213643|10190|f9fd36f3c3711305

sasha@mysql.sashanet.com|mysql-test/t/include/master-slave.inc|20001118030458|01636|556fd038c3a3d54

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ 
SUBDIRS =		include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ @sql_client_dirs@ \

			@sql_server_dirs@ scripts tests man \

			@bench_dirs@ support-files

			@bench_dirs@ support-files mysql-test



# Relink after clean

CLEANFILES =		linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -1887,6 +1887,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \ 
 merge/Makefile dbug/Makefile scripts/Makefile \

 include/Makefile sql-bench/Makefile \

 tests/Makefile Docs/Makefile support-files/Makefile \

 mysql-test/Makefile \

 include/mysql_version.h

 , , [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])

libmysql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ nh = global.h config-win32.h dbug.h errmsg.h global.h \ 
		m_ctype.h m_string.h \

		my_alarm.h my_config.h my_dir.h my_list.h my_net.h my_sys.h \

		mysql.h mysql_com.h mysql_version.h mysqld_error.h mysys_err.h \

		my_pthread.h thr_alarm.h violite.h

		my_pthread.h thr_alarm.h violite.h hash.h

# Get a list of the needed objects  

lobjs = $(mysysobjects1) $(dbugobjects) $(mystringsobjects)