diff options
| author | unknown <istruewing@chilla.local> | 2006-09-19 11:27:00 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-09-19 11:27:00 +0200 |
| commit | 08f4565e6a2c4844b95702fcdcaa45ff0d84b5ce (patch) | |
| tree | 749377f8967b96e91ae158feab767b7079aecd31 /.bzrignore | |
| parent | 06ced7c198c491da066fbf9b0fc17c669e7ddc61 (diff) | |
| parent | 82a72ee17e74db84b2c7a5ecfccf8a459c642acc (diff) | |
| download | mariadb-git-08f4565e6a2c4844b95702fcdcaa45ff0d84b5ce.tar.gz | |
Merge chilla.local:/home/mydev/mysql-4.1-bug14400-monty
into chilla.local:/home/mydev/mysql-5.0-bug14400-monty
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
myisam/mi_rkey.c:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
myisam/mi_test_all.res:
Manual merge from 4.1.
sql/sql_select.cc:
Manual merge from 4.1.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 1d0184fb0f5..7e6c6985e23 100644 --- a/.bzrignore +++ b/.bzrignore @@ -31,6 +31,8 @@ *.vcproj */*.dir/* */*_pure_*warnings +*/.deps +*/.libs/* */.pure */debug/* */release/* |