merge

BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/count_distinct2.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/rpl000017.test:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
libmysqld/Makefile.am:
  Added back md5.c

1 files changed, 4 insertions, 2 deletions

diff --git a/.bzrignore b/.bzrignore
index e6e82e1047f..415aba16441 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -7,6 +7,7 @@
 *.la
 *.lo
 *.o
+*.reject
 *.spec
 */*_pure_*warnings
 */.pure
@@ -152,6 +153,7 @@ client/mysqlbinlog
 client/mysqlcheck
 client/mysqldump
 client/mysqlimport
+client/mysqlmanager-pwgen
 client/mysqlmanagerc
 client/mysqlshow
 client/mysqltest
@@ -214,6 +216,7 @@ libmysqld/examples/mysqltest.c
 libmysqld/examples/readline.cc
 libmysqld/examples/sql_string.cc
 libmysqld/examples/sql_string.h
+libmysqld/examples/test-gdbinit
 libmysqld/field.cc
 libmysqld/field_conv.cc
 libmysqld/filesort.cc
@@ -337,6 +340,7 @@ scripts/make_binary_distribution
 scripts/msql2mysql
 scripts/mysql_config
 scripts/mysql_convert_table_format
+scripts/mysql_explain_log
 scripts/mysql_find_rows
 scripts/mysql_fix_privilege_tables
 scripts/mysql_install_db
@@ -413,5 +417,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-client/mysqlmanager-pwgen
-*.reject