Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

BUILD/FINISH.sh

@@ -14,7 +14,8 @@ $make -k clean || true
 /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache
 
 aclocal && autoheader && aclocal && automake && autoconf
-(cd bdb/dist && sh s_all)
+# TODO: remove when DBD will be OK
+#(cd bdb/dist && sh s_all)
 (cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
 if [ -d gemini ]
 then

configure.in

@@ -2368,7 +2368,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
  os2/Makefile os2/include/Makefile os2/include/sys/Makefile \
  man/Makefile BUILD/Makefile readline/Makefile vio/Makefile \
  libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \
- libmysql/Makefile client/Makefile os2/Makefile \
+ libmysql/Makefile client/Makefile \
  pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile \
  merge/Makefile dbug/Makefile scripts/Makefile \
  include/Makefile sql-bench/Makefile tools/Makefile \

mysys/Makefile.am

@@ -105,7 +105,7 @@ test_dir: test_dir.c $(LIBRARIES)
 test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
 
-charset2html: charset2html.c $(LIBRARIES)
+charset2html$(EXEEXT): charset2html.c $(LIBRARIES)
 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/charset2html.c $(LDADD) $(LIBS)
 
 testhash: testhash.c $(LIBRARIES)