diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-08-11 15:27:10 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-08-11 15:27:10 -0600 |
| commit | 23d5f3f96546ce146c0986c53b114761b56a8650 (patch) | |
| tree | e96bafef55caa5d0629b7458f3e7443b77511e04 /.bzrignore | |
| parent | f6751dd8db31161f6eaa0a80aa8cf1b8f9c930c3 (diff) | |
| parent | ebb3bd0f75ecb2b89e4fe07c693caa9e09c2ce3a (diff) | |
| download | mariadb-git-23d5f3f96546ce146c0986c53b114761b56a8650.tar.gz | |
Merge work:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysqlbinlog.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 834b4a946b6..5eb355adf90 100644 --- a/.bzrignore +++ b/.bzrignore @@ -141,13 +141,19 @@ bdb/test/logtrack.list bdb/txn/txn_auto.c binary/* client/insert_test +client/log_event.cc +client/log_event.h +client/mf_iocache.c +client/mf_iocache.cc client/mysql client/mysqladmin +client/mysqlbinlog client/mysqlcheck client/mysqldump client/mysqlimport client/mysqlshow client/mysqltest +client/mysys_priv.h client/select_test client/thimble client/thread_test @@ -214,6 +220,7 @@ mysql-test/mysql-test-run mysql-test/r/*.reject mysql-test/share/mysql mysql-test/var/* +mysql.kdevprj mysql.proj mysqld.S mysqld.sym |