diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-01 10:25:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-01 10:25:50 +0200 |
| commit | 8f9a867b77df584fd79369733892ccda58204bff (patch) | |
| tree | 3d8cfeb64cbc7a8f601c15e082171df087d75761 /.bzrignore | |
| parent | 4e16868d88425ff5075fccc348ddb09acc3e7bf7 (diff) | |
| parent | 1bb1679c19614f3a2883e76fd03b09a216be4892 (diff) | |
| download | mariadb-git-8f9a867b77df584fd79369733892ccda58204bff.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr
into shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
BitKeeper/etc/ignore:
auto-union
mysql-test/Makefile.am:
Manual merge 4.1 -> 5.0
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 84713371ce8..555199fd166 100644 --- a/.bzrignore +++ b/.bzrignore @@ -671,6 +671,7 @@ mysql-test/*.ds? mysql-test/*.vcproj mysql-test/gmon.out mysql-test/install_test_db +mysql-test/mtr mysql-test/mysql-test-run mysql-test/mysql-test-run.log mysql-test/mysql_test_run_new |