Merge zim.(none):/home/ian/workspace/mysql-5.0

into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian


BitKeeper/etc/ignore:
  auto-union
include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Changing message to add in bug numnber

1 files changed, 10 insertions, 7 deletions

diff --git a/.bzrignore b/.bzrignore
index 87ef6963549..1340763c903 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -683,18 +683,24 @@ mysql-test/r/*.out
 mysql-test/r/*.reject
 mysql-test/r/alter_table.err
 mysql-test/r/archive.err
+mysql-test/r/backup.log
 mysql-test/r/bdb-alter-table-1.err
 mysql-test/r/bdb-alter-table-2.err
 mysql-test/r/bdb-crash.err
 mysql-test/r/bdb-deadlock.err
 mysql-test/r/bdb.err
+mysql-test/r/bdb.log
 mysql-test/r/bdb_cache.err
 mysql-test/r/client_test.err
 mysql-test/r/csv.err
 mysql-test/r/ctype_ucs.err
 mysql-test/r/derived.err
+mysql-test/r/events.log
+mysql-test/r/events_bugs.log
+mysql-test/r/events_logs_tests.log
 mysql-test/r/exampledb.err
 mysql-test/r/func_encrypt.err
+mysql-test/r/im_client_port.log
 mysql-test/r/index_merge_load.result
 mysql-test/r/isam.err
 mysql-test/r/lowercase_table2.err
@@ -704,6 +710,7 @@ mysql-test/r/mysqlbinlog.err
 mysql-test/r/mysqlbinlog2.err
 mysql-test/r/mysqldump.err
 mysql-test/r/mysqltest.err
+mysql-test/r/mysqltest.log
 mysql-test/r/ndb_alter_table.err
 mysql-test/r/ndb_autodiscover.err
 mysql-test/r/ndb_autodiscover2.err
@@ -743,6 +750,9 @@ mysql-test/r/rpl000016.eval
 mysql-test/r/rpl_log.eval
 mysql-test/r/slave-running.eval
 mysql-test/r/slave-stopped.eval
+mysql-test/r/symlink.log
+mysql-test/r/system_mysql_db.log
+mysql-test/r/udf.log
 mysql-test/share/mysql
 mysql-test/std_data/*.pem
 mysql-test/t/index_merge.load
@@ -1748,10 +1758,3 @@ vio/viotest-sslconnect.cpp
 vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
-mysql-test/r/backup.log
-mysql-test/r/events.log
-mysql-test/r/events_bugs.log
-mysql-test/r/events_logs_tests.log
-mysql-test/r/mysqltest.log
-mysql-test/r/symlink.log
-mysql-test/r/system_mysql_db.log