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:
commit
3df461e5e1
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user