diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-21 14:30:47 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-21 14:30:47 +0100 |
| commit | 2176fef44694e7980c39c536640a62b87517994d (patch) | |
| tree | fc91790b327404a804ed62021d2a2491d2092551 /.bzrignore | |
| parent | 971f15f83f13dd61d967fffc8d305c3a2ff8f6d1 (diff) | |
| parent | 20554a6c356f8badcc55213f2f4a0f5d9933fa70 (diff) | |
| download | mariadb-git-2176fef44694e7980c39c536640a62b87517994d.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
Auto merged
BitKeeper/deleted/.del-test_db.sql:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.h:
Auto merged
netware/Makefile.am:
Manual merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index f156bb656a4..c75109c401c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1068,7 +1068,9 @@ ndbcluster-1186/ndb_3.pid ndbcluster-1186/ndb_3_cluster.log ndbcluster-1186/ndb_3_out.log ndbcluster-1186/ndbcluster.pid +netware/init_db.sql netware/libmysql.imp +netware/test_db.sql pack_isam/*.ds? perror/*.ds? perror/*.vcproj @@ -1337,5 +1339,3 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj -netware/init_db.sql -netware/test_db.sql |