diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-24 22:02:33 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 22:02:33 +0200 |
| commit | 5f79aa753ab94cb0e42088a9c8311af7c9c6d6a7 (patch) | |
| tree | 489db8e52659114c4f43b718a97776e2b6b88e79 /.bzrignore | |
| parent | 5154dd662594e7ab0e83e77fe5652bfa0eba92da (diff) | |
| parent | 47b1c7f9a53c4b40cbaaae4da47e78a671bc5836 (diff) | |
| download | mariadb-git-5f79aa753ab94cb0e42088a9c8311af7c9c6d6a7.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
include/Makefile.am:
Auto merged
include/mysql.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
configure.in:
SCCS merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 6abf5d3eb8b..9c9121c5dc5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -567,8 +567,10 @@ heap/hp_test2 help help.c help.h +include/check_abi include/my_config.h include/my_global.h +include/mysql_h.ic include/mysql_version.h include/mysqld_ername.h include/mysqld_error.h @@ -1260,6 +1262,7 @@ mysql-test/r/bdb-deadlock.err mysql-test/r/bdb.err mysql-test/r/bdb.log mysql-test/r/bdb_cache.err +mysql-test/r/blackhole.log mysql-test/r/client_test.err mysql-test/r/csv.err mysql-test/r/ctype_ucs.err |