diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-24 21:05:35 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 21:05:35 +0200 |
| commit | 80bd3e38563813af274a62fd9809fbbb203c4f0a (patch) | |
| tree | c136b0a00ea50e3fcf9f002ac4ab645656cb72ad /.bzrignore | |
| parent | fa6d7c505c29cdaec139d243473da63411aa188b (diff) | |
| parent | f89efeb5f60c8cdbf1a4f70003f7740623934220 (diff) | |
| download | mariadb-git-80bd3e38563813af274a62fd9809fbbb203c4f0a.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
include/mysql.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
include/Makefile.am:
Merge, SUPERCLEANFILES and CLEANFILES has dissapeared in 5.0
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index ecaa4b60c51..e167619c1a6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -403,8 +403,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 @@ -704,6 +706,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 |