Commit 3df461e5 authored by unknown's avatar unknown

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.
parents 82047fab a00e5c68
...@@ -1277,7 +1277,6 @@ mysql-test/r/*.err ...@@ -1277,7 +1277,6 @@ mysql-test/r/*.err
mysql-test/r/*.log mysql-test/r/*.log
mysql-test/r/*.out mysql-test/r/*.out
mysql-test/r/*.reject mysql-test/r/*.reject
mysql-test/r/*.warnings
mysql-test/r/alter_table.err mysql-test/r/alter_table.err
mysql-test/r/archive.err mysql-test/r/archive.err
mysql-test/r/backup.log mysql-test/r/backup.log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment