diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-03-19 11:15:59 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-03-19 11:15:59 +0100 |
| commit | be1fb16006b11a360b8439877c34ea6e49007ecf (patch) | |
| tree | 03513f9684a07a5f525ab42fea770ce28016381e /.bzrignore | |
| parent | 56ce4907f1112934a34be6c0a4dc03a00ae32436 (diff) | |
| parent | 0eec6c133a164eb2b0c19f0241054edb4a52825f (diff) | |
| download | mariadb-git-be1fb16006b11a360b8439877c34ea6e49007ecf.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
netware/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
tests/Makefile.am:
Auto merged
mysql-test/install_test_db.sh:
Manual merge
sql/sql_acl.h:
Manual merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index c91df60c99f..c04ce91b355 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1763,7 +1763,9 @@ netware/.deps/my_manage.Po netware/.deps/mysql_install_db.Po netware/.deps/mysql_test_run.Po netware/.deps/mysqld_safe.Po +netware/init_db.sql netware/libmysql.imp +netware/test_db.sql pack_isam/*.ds? perror/*.ds? perror/*.vcproj |