Commit e106a142 authored Apr 05, 2005 by unknown

Merge bk-internal:/home/bk/mysql-5.0

into mysql.com:/home/jimw/my/mysql-5.0-clean

parents 2db55537 5a28f962

.bzrignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -1107,3 +1107,5 @@ vio/test-sslclient
		vio/test-sslserver
		vio/viotest-ssl
		VC++Files/client/mysql_amd64.dsp
		client/mysqltestmanager-pwgen
		client/mysqltestmanagerc

configure.in

+0 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ sinclude(config/ac-macros/ha_blackhole.m4)
		sinclude(config/ac-macros/ha_example.m4)
		sinclude(config/ac-macros/ha_federated.m4)
		sinclude(config/ac-macros/ha_innodb.m4)
		sinclude(config/ac-macros/ha_isam.m4)
		sinclude(config/ac-macros/ha_ndbcluster.m4)
		sinclude(config/ac-macros/ha_tina.m4)
		sinclude(config/ac-macros/large_file.m4)