diff options
| author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-02-22 15:30:28 +0400 |
|---|---|---|
| committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-02-22 15:30:28 +0400 |
| commit | 68ce2b2eb3ef94f129530f7d47f52dbd40df01dc (patch) | |
| tree | 6845bf051296a682ce30b1a60a389b77accfa4a1 /.bzrignore | |
| parent | 7bff4661a3b1ade2203d42afdcaee8543c6d5033 (diff) | |
| parent | fe48e57796f887718cc1a9987f48c192dfcf7956 (diff) | |
| download | mariadb-git-68ce2b2eb3ef94f129530f7d47f52dbd40df01dc.tar.gz | |
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
BitKeeper/etc/ignore:
auto-union
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 319612b83c8..d22d68be57d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -58,6 +58,8 @@ Docs/manual_letter.ps Docs/manual_toc.html Docs/my_sys.doc Docs/mysql.info +Docs/mysql.xml +Docs/safe-mysql.xml Docs/tex.fmt Docs/texi2dvi.out INSTALL-SOURCE @@ -339,12 +341,15 @@ myisam/mi_test_all myisam/myisamchk myisam/myisamlog myisam/myisampack +myisam/rt_test +myisam/sp_test myisam/test1.MYD myisam/test1.MYI mysql-test/gmon.out mysql-test/install_test_db mysql-test/mysql-test-run mysql-test/r/*.reject +mysql-test/r/rpl000001.eval mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval mysql-test/r/rpl000015.eval @@ -458,6 +463,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -Docs/mysql.xml -mysql-test/r/rpl000001.eval -Docs/safe-mysql.xml |