diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-02-28 16:41:30 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-02-28 16:41:30 +0100 |
| commit | 3297d47fc31613cdf904353337fdd25403b708f2 (patch) | |
| tree | a34ba2ec5d5884a91d654ff20285ef6132d134ea /.bzrignore | |
| parent | bd296f16a19c0a02fbc2a0b97ee0c7e935e5232b (diff) | |
| parent | 2a02f9c964e894914412aa48931d984b47fdaac4 (diff) | |
| download | mariadb-git-3297d47fc31613cdf904353337fdd25403b708f2.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 6bb1ebef69b..4ee902bbeb7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1249,6 +1249,7 @@ mysql-test/*.ds? mysql-test/*.vcproj mysql-test/gmon.out mysql-test/install_test_db +mysql-test/lib/init_db.sql mysql-test/mtr mysql-test/mysql-test-run mysql-test/mysql-test-run-shell |