diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-11-07 16:53:11 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-11-07 16:53:11 -0700 |
| commit | 91fb1d23770503d29744fc0c973065decd1bf0a1 (patch) | |
| tree | d3db56314fc156ded359f4215bf7323fce62b131 /.bzrignore | |
| parent | 356003a8c9d939dc5c95f50539d3916e404d25a9 (diff) | |
| parent | 3c4e170d806a1c3c623bf8a777fa1f6ba4bb6015 (diff) | |
| download | mariadb-git-91fb1d23770503d29744fc0c973065decd1bf0a1.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
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
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 dd59dc203f5..936f4c48bb0 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 |