diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-08-27 17:34:29 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-08-27 17:34:29 -0600 |
commit | 7a17233bcf0a1fda1ad6fdda69ebab23ca59ce67 (patch) | |
tree | d10bc0e7ea9b0c57b2a8327103d8a013557f238e /.bzrignore | |
parent | a4c13122f5e8778451cf06139b16395427138f9d (diff) | |
parent | 5e878c0d9a7f08021f7b77a7a064335b52246fc5 (diff) | |
download | mariadb-git-7a17233bcf0a1fda1ad6fdda69ebab23ca59ce67.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
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 863682099d3..55b991d8102 100644 --- a/.bzrignore +++ b/.bzrignore @@ -20,6 +20,7 @@ .out .snprj/* .vimrc +=6 BitKeeper/etc/config BitKeeper/etc/csets BitKeeper/etc/csets-in @@ -208,6 +209,7 @@ libmysqld/filesort.cc libmysqld/get_password.c libmysqld/ha_berkeley.cc libmysqld/ha_heap.cc +libmysqld/ha_innobase.cc libmysqld/ha_isam.cc libmysqld/ha_isammrg.cc libmysqld/ha_myisam.cc @@ -283,6 +285,7 @@ linked_libmysql_r_sources linked_libmysql_sources linked_libmysqld_sources linked_server_sources +linked_tools_sources locked myisam/ft_dump myisam/ft_eval @@ -390,8 +393,9 @@ support-files/mysql.server support-files/mysql.spec tags tmp/* -vio/viotest-ssl -=6 -libmysqld/ha_innobase.cc +tools/my_vsnprintf.c +tools/mysqlmngd +tools/mysys_priv.h vio/test-sslclient vio/test-sslserver +vio/viotest-ssl |