diff options
| author | unknown <igor@rurik.mysql.com> | 2003-12-08 11:26:34 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-12-08 11:26:34 -0800 |
| commit | 8a871dee94ffafb5ddc2adbef3c36461ee8a162f (patch) | |
| tree | 883609b2576cfba0b9e9e4d68fc5401d25378ea6 /.bzrignore | |
| parent | 653ca425a00381695620fbb2ff273c612a304ced (diff) | |
| parent | 7f85aae9c4232aa7701adae74cdeb0059c90a93d (diff) | |
| download | mariadb-git-8a871dee94ffafb5ddc2adbef3c36461ee8a162f.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
BitKeeper/etc/ignore:
auto-union
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 5cf903dc1a7..f2ecc0684d6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -74,6 +74,7 @@ Docs/safe-mysql.xml Docs/tex.fmt Docs/texi2dvi.out INSTALL-SOURCE +INSTALL-WIN-SOURCE Logs/* MIRRORS Makefile @@ -482,6 +483,7 @@ mysql-test/gmon.out mysql-test/install_test_db mysql-test/mysql-test-run mysql-test/r/*.reject +mysql-test/r/index_merge_load.result mysql-test/r/rpl000001.eval mysql-test/r/rpl000002.eval mysql-test/r/rpl000014.eval @@ -492,6 +494,7 @@ mysql-test/r/slave-running.eval mysql-test/r/slave-stopped.eval mysql-test/share/mysql mysql-test/std_data/*.pem +mysql-test/t/index_merge.load mysql-test/var/* mysql.kdevprj mysql.proj @@ -646,5 +649,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -mysql-test/r/index_merge_load.result -mysql-test/t/index_merge.load |