diff options
| author | unknown <istruewing@chilla.local> | 2006-09-19 14:33:29 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-09-19 14:33:29 +0200 |
| commit | a84f71b9c72304bfab097ec53da137b5da7c1682 (patch) | |
| tree | dcb06400a64a83a034aa2a68c0e6f4623a8da592 /.bzrignore | |
| parent | 3d4b52ef28e87fa1867141ac12b66ea66370b68e (diff) | |
| parent | 11ba3204e12141ed280e860acb6b050f7fffd235 (diff) | |
| download | mariadb-git-a84f71b9c72304bfab097ec53da137b5da7c1682.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty
into chilla.local:/home/mydev/mysql-5.1-bug14400-monty
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/handler.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/mi_test_all.res:
Auto merged
storage/myisam/mi_test_all.sh:
Merge from 5.0.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index f32b85ce6af..af3106b98f3 100644 --- a/.bzrignore +++ b/.bzrignore @@ -34,6 +34,8 @@ *.vcproj */*.dir/* */*_pure_*warnings +*/.deps +*/.libs/* */.pure */debug/* */release/* |