diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-11-07 16:27:30 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-11-07 16:27:30 -0700 |
| commit | 3c4e170d806a1c3c623bf8a777fa1f6ba4bb6015 (patch) | |
| tree | 563c187169e36cf7d0b22a5462deb893cda21a46 /.bzrignore | |
| parent | 680646c2aebec94482413d39062fbdfe96c6bda6 (diff) | |
| parent | fa09f2cd7e74fc99d6699a7bcda60fc7135b6f0e (diff) | |
| download | mariadb-git-3c4e170d806a1c3c623bf8a777fa1f6ba4bb6015.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
mysys/mf_iocache.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 6113e896ea7..56094cd2e78 100644 --- a/.bzrignore +++ b/.bzrignore @@ -348,8 +348,10 @@ mysql.kdevprj mysql.proj mysqld.S mysqld.sym +mysys/#mf_iocache.c# mysys/test_charset mysys/test_dir +mysys/test_io_cache mysys/test_thr_alarm mysys/test_thr_lock mysys/testhash |