Fixed locking problem when using bulk insert

Fixed array overrun when using drop_db
Portability fixes


BitKeeper/etc/ignore:
  Added libmysqld/examples/completion_hash.cc libmysqld/examples/completion_hash.h libmysqld/examples/my_readline.h libmysqld/examples/mysql.cc libmysqld/examples/mysqltest.c libmysqld/examples/readline.cc libmysqld/examples/sql_string.cc libmysqld/examples/sql_string.h to the ignore list
acinclude.m4:
  Fixed reference to top_builddir
myisam/mi_write.c:
  Fixed locking problem when using bulk insert
sql/sql_db.cc:
  Fixed array overrun when using drop_db

1 files changed, 36 insertions, 36 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 3ee6be6b894..95df3903c32 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1071,42 +1071,42 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
 dnl Some libs are listed several times, in order for gcc to sort out
 dnl circular references.
       innodb_libs="\
- $(top_builddir)/innobase/usr/libusr.a\
- $(top_builddir)/innobase/odbc/libodbc.a\
- $(top_builddir)/innobase/srv/libsrv.a\
- $(top_builddir)/innobase/que/libque.a\
- $(top_builddir)/innobase/srv/libsrv.a\
- $(top_builddir)/innobase/dict/libdict.a\
- $(top_builddir)/innobase/ibuf/libibuf.a\
- $(top_builddir)/innobase/row/librow.a\
- $(top_builddir)/innobase/pars/libpars.a\
- $(top_builddir)/innobase/btr/libbtr.a\
- $(top_builddir)/innobase/trx/libtrx.a\
- $(top_builddir)/innobase/read/libread.a\
- $(top_builddir)/innobase/usr/libusr.a\
- $(top_builddir)/innobase/buf/libbuf.a\
- $(top_builddir)/innobase/ibuf/libibuf.a\
- $(top_builddir)/innobase/eval/libeval.a\
- $(top_builddir)/innobase/log/liblog.a\
- $(top_builddir)/innobase/fsp/libfsp.a\
- $(top_builddir)/innobase/fut/libfut.a\
- $(top_builddir)/innobase/fil/libfil.a\
- $(top_builddir)/innobase/lock/liblock.a\
- $(top_builddir)/innobase/mtr/libmtr.a\
- $(top_builddir)/innobase/page/libpage.a\
- $(top_builddir)/innobase/rem/librem.a\
- $(top_builddir)/innobase/thr/libthr.a\
- $(top_builddir)/innobase/com/libcom.a\
- $(top_builddir)/innobase/sync/libsync.a\
- $(top_builddir)/innobase/data/libdata.a\
- $(top_builddir)/innobase/mach/libmach.a\
- $(top_builddir)/innobase/ha/libha.a\
- $(top_builddir)/innobase/dyn/libdyn.a\
- $(top_builddir)/innobase/mem/libmem.a\
- $(top_builddir)/innobase/sync/libsync.a\
- $(top_builddir)/innobase/ut/libut.a\
- $(top_builddir)/innobase/os/libos.a\
- $(top_builddir)/innobase/ut/libut.a"
+ \$(top_builddir)/innobase/usr/libusr.a\
+ \$(top_builddir)/innobase/odbc/libodbc.a\
+ \$(top_builddir)/innobase/srv/libsrv.a\
+ \$(top_builddir)/innobase/que/libque.a\
+ \$(top_builddir)/innobase/srv/libsrv.a\
+ \$(top_builddir)/innobase/dict/libdict.a\
+ \$(top_builddir)/innobase/ibuf/libibuf.a\
+ \$(top_builddir)/innobase/row/librow.a\
+ \$(top_builddir)/innobase/pars/libpars.a\
+ \$(top_builddir)/innobase/btr/libbtr.a\
+ \$(top_builddir)/innobase/trx/libtrx.a\
+ \$(top_builddir)/innobase/read/libread.a\
+ \$(top_builddir)/innobase/usr/libusr.a\
+ \$(top_builddir)/innobase/buf/libbuf.a\
+ \$(top_builddir)/innobase/ibuf/libibuf.a\
+ \$(top_builddir)/innobase/eval/libeval.a\
+ \$(top_builddir)/innobase/log/liblog.a\
+ \$(top_builddir)/innobase/fsp/libfsp.a\
+ \$(top_builddir)/innobase/fut/libfut.a\
+ \$(top_builddir)/innobase/fil/libfil.a\
+ \$(top_builddir)/innobase/lock/liblock.a\
+ \$(top_builddir)/innobase/mtr/libmtr.a\
+ \$(top_builddir)/innobase/page/libpage.a\
+ \$(top_builddir)/innobase/rem/librem.a\
+ \$(top_builddir)/innobase/thr/libthr.a\
+ \$(top_builddir)/innobase/com/libcom.a\
+ \$(top_builddir)/innobase/sync/libsync.a\
+ \$(top_builddir)/innobase/data/libdata.a\
+ \$(top_builddir)/innobase/mach/libmach.a\
+ \$(top_builddir)/innobase/ha/libha.a\
+ \$(top_builddir)/innobase/dyn/libdyn.a\
+ \$(top_builddir)/innobase/mem/libmem.a\
+ \$(top_builddir)/innobase/sync/libsync.a\
+ \$(top_builddir)/innobase/ut/libut.a\
+ \$(top_builddir)/innobase/os/libos.a\
+ \$(top_builddir)/innobase/ut/libut.a"
 
       AC_CHECK_LIB(rt, aio_read, [innodb_libs="$innodb_libs -lrt"])
       ;;