diff options
| author | unknown <jimw@mysql.com> | 2005-01-24 13:48:48 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-24 13:48:48 -0800 |
| commit | c312cf2762cfc68abaebd87294331f599a522436 (patch) | |
| tree | c3a261433ebe14a453233665edd8251485c39c4a /.bzrignore | |
| parent | 712f3f677b97a89bc1a2ff6a67cbda00a2be25ca (diff) | |
| parent | 844fe1ea6d8a14d04e78751be1e77838aa2bbd7d (diff) | |
| download | mariadb-git-c312cf2762cfc68abaebd87294331f599a522436.tar.gz | |
Merge
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysqld.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index c8f50c927ad..460ea002bff 100644 --- a/.bzrignore +++ b/.bzrignore @@ -396,6 +396,7 @@ libmysqld/gstream.cc libmysqld/ha_archive.cc libmysqld/ha_berkeley.cc libmysqld/ha_example.cc +libmysqld/ha_federated.cc libmysqld/ha_heap.cc libmysqld/ha_innobase.cc libmysqld/ha_innodb.cc @@ -1036,6 +1037,7 @@ test/tools/verify_index test_xml tests/client_test tests/connect_test +tests/mysql_client_test thread_test tmp/* tools/my_vsnprintf.c @@ -1047,4 +1049,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -libmysqld/ha_federated.cc |