diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-01 10:32:20 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-01 10:32:20 +0200 |
| commit | 5808eec26dace2d9aec5bfa7f53797dbe860acb7 (patch) | |
| tree | 25d17c341ae9921d9799b206d109ca1e690fe285 /.bzrignore | |
| parent | cf747aa3f7d6f176f3b103fcb71f2288d475bb99 (diff) | |
| parent | 8f9a867b77df584fd79369733892ccda58204bff (diff) | |
| download | mariadb-git-5808eec26dace2d9aec5bfa7f53797dbe860acb7.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
into shellback.(none):/home/msvensson/mysql/mtr/my51-mtr
BitKeeper/etc/ignore:
auto-union
mysql-test/Makefile.am:
Merge 5.0 -> 5.1
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 095c8bb7390..375fe14b9ad 100644 --- a/.bzrignore +++ b/.bzrignore @@ -692,6 +692,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 |