diff options
| author | ingo@mysql.com <> | 2004-04-07 14:56:24 +0200 |
|---|---|---|
| committer | ingo@mysql.com <> | 2004-04-07 14:56:24 +0200 |
| commit | 4de7e18b81144967af0575668062bee9a8617646 (patch) | |
| tree | d67591428ccd76b55914906b3a2c65c7a878c8b9 /.bzrignore | |
| parent | 61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff) | |
| parent | 376f252659658e023002a3d6e371bc30d5e2df5d (diff) | |
| download | mariadb-git-4de7e18b81144967af0575668062bee9a8617646.tar.gz | |
Hand-resolved auto merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index a056e90b810..4c6b2a8a2d5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -250,6 +250,7 @@ client/thimble client/thread_test client_test cmd-line-utils/libedit/common.h +cmd-line-utils/libedit/makelist comon.h config.cache config.h @@ -300,6 +301,7 @@ innobase/ib_config.h innobase/ib_config.h.in innobase/stamp-h1 insert_test +install isam/isamchk isam/isamlog isam/pack_isam @@ -504,6 +506,7 @@ mysys/main.cc mysys/ste5KbMa mysys/test_charset mysys/test_dir +mysys/test_gethwaddr mysys/test_io_cache mysys/test_thr_alarm mysys/test_thr_lock @@ -646,5 +649,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -mysys/test_gethwaddr -cmd-line-utils/libedit/makelist |