Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/rpl_loaddata.test:
  Use local.
mysql-test/r/rpl_loaddata.result:
  Use local.
This commit is contained in:
unknown 2007-06-01 18:11:21 +04:00
commit 3df461e5e1

View File

@ -1277,7 +1277,6 @@ mysql-test/r/*.err
mysql-test/r/*.log
mysql-test/r/*.out
mysql-test/r/*.reject
mysql-test/r/*.warnings
mysql-test/r/alter_table.err
mysql-test/r/archive.err
mysql-test/r/backup.log