Merge to get fix for LOCK TABLES + DROP TABLE in another thread

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-delete.result:
  Delete: mysql-test/r/delete.result
client/mysqlbinlog.cc:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
sql/field.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/type_datetime.result:
  Update results after merge
sql/log_event.h:
  Use local version
sql/mysql_priv.h:
  Use local version
sql/mysqld.cc:
  Use local version
sql/sql_repl.h:
  Use local version

1 files changed, 8 insertions, 6 deletions

diff --git a/.bzrignore b/.bzrignore
index f5e9775ee80..f497aa69ffd 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -206,6 +206,7 @@ config.h.in
 config.log
 config.status
 configure
+configure.lineno
 core
 core.2430
 db-*.*.*
@@ -214,6 +215,7 @@ depcomp
 extra/comp_err
 extra/my_print_defaults
 extra/mysql_install
+extra/mysql_waitpid
 extra/perror
 extra/replace
 extra/resolve_stack_dump
@@ -232,6 +234,7 @@ innobase/autom4te.cache/*
 innobase/autom4te.cache/output.0
 innobase/autom4te.cache/requests
 innobase/autom4te.cache/traces.0
+innobase/configure.lineno
 innobase/conftest.s1
 innobase/conftest.subs
 innobase/ib_config.h
@@ -499,6 +502,11 @@ stamp-h1
 strings/conf_to_src
 strings/ctype_autoconf.c
 strings/ctype_extra_sources.c
+support-files/MacOSX/Description.plist
+support-files/MacOSX/Info.plist
+support-files/MacOSX/StartupParameters.plist
+support-files/MacOSX/postinstall
+support-files/MacOSX/preinstall
 support-files/binary-configure
 support-files/my-huge.cnf
 support-files/my-large.cnf
@@ -522,9 +530,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-extra/mysql_waitpid
-support-files/MacOSX/Description.plist
-support-files/MacOSX/Info.plist
-support-files/MacOSX/StartupParameters.plist
-support-files/MacOSX/postinstall
-support-files/MacOSX/preinstall