diff options
author | unknown <tim@black.box> | 2001-09-16 22:10:50 -0400 |
---|---|---|
committer | unknown <tim@black.box> | 2001-09-16 22:10:50 -0400 |
commit | dd02abb187d00ed7d0f2aa0baace2d3d0e730511 (patch) | |
tree | 6784f5457669bae83fdca495c6affbe7e3e41b30 /.bzrignore | |
parent | 5810866b69ab1ef14b26305fa45943686377da2b (diff) | |
parent | 5fffbb123615ad0b256652390467b33ed2919afc (diff) | |
download | mariadb-git-dd02abb187d00ed7d0f2aa0baace2d3d0e730511.tar.gz |
Merge
BitKeeper/etc/ignore:
auto-union
configure.in:
SCCS merged
client/mysql.cc:
SCCS merged
client/mysqltest.c:
SCCS merged
mysql-test/mysql-test-run.sh:
Auto merged
libmysqld/libmysqld.c:
SCCS merged
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 404de44a8f8..8a43e77a930 100644 --- a/.bzrignore +++ b/.bzrignore @@ -177,6 +177,7 @@ gmon.out heap/hp_test1 heap/hp_test2 include/my_config.h +include/my_global.h include/mysql_version.h include/widec.h innobase/conftest.s1 @@ -283,6 +284,7 @@ linked_include_sources linked_libmysql_r_sources linked_libmysql_sources linked_libmysqld_sources +linked_libmysqldex_sources linked_server_sources linked_tools_sources locked @@ -393,11 +395,10 @@ support-files/mysql.spec tags tmp/* tools/my_vsnprintf.c +tools/mysqlmanager tools/mysqlmngd tools/mysys_priv.h +vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -tools/mysqlmanager -vio/test-ssl -vio/test-ssl |