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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
a8f48973 · unknown · 4a98dae6 · 5cd6603b · a8f48973 · a8f48973
Commit a8f48973 authored Apr 05, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.bzrignore .bzrignore +2 -0

configure.in configure.in +0 -1

No files found.
--- a/.bzrignore
+++ b/.bzrignore
@@ -1107,3 +1107,5 @@ vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
 VC++Files/client/mysql_amd64.dsp
+client/mysqltestmanager-pwgen
+client/mysqltestmanagerc
--- a/configure.in
+++ b/configure.in
@@ -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)