diff options
| author | unknown <kostja@bodhi.(none)> | 2007-06-01 18:11:21 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-06-01 18:11:21 +0400 |
| commit | 3df461e5e1b1b3f88940878ceab0cb35e8da4812 (patch) | |
| tree | 00fc6e524cbd4a51a5cbb250dc5a2506462bf08b /.bzrignore | |
| parent | 82047fab57573e187892663adbf23d384b06bc25 (diff) | |
| parent | a00e5c6896e4a2d128aa7da5fabcb508ebd67f0f (diff) | |
| download | mariadb-git-3df461e5e1b1b3f88940878ceab0cb35e8da4812.tar.gz | |
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.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index f583ab382d9..8347800ffb3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -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 |