diff options
| author | unknown <istruewing@chilla.local> | 2006-09-19 10:17:25 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-09-19 10:17:25 +0200 |
| commit | 82a72ee17e74db84b2c7a5ecfccf8a459c642acc (patch) | |
| tree | 397628c9d94447f43c72762c69080ac4098584d7 /.bzrignore | |
| parent | ab7d1d70a4db399ed69b73c523b14483fa786bdf (diff) | |
| parent | dcb665900136fb4015589680c612add8abf1deca (diff) | |
| download | mariadb-git-82a72ee17e74db84b2c7a5ecfccf8a459c642acc.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
myisam/mi_rkey.c:
Manual null merge as a better fix is already present.
mysql-test/r/myisam.result:
Manual null merge as a better fix is already present.
mysql-test/t/myisam.test:
Manual null merge as a better fix is already present.
sql/sql_select.cc:
Manual merge of purify improvements.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index 6dd06504096..9bd62bef525 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,3 +1,5 @@ +*.Plo +*.Po *.a *.bb *.bbg @@ -11,6 +13,8 @@ *.reject *.spec */*_pure_*warnings +*/.deps +*/.libs/* */.pure *~ .*.swp @@ -336,6 +340,7 @@ isam/test2 isam/test3 libmysql/*.c libmysql/conf_to_src +libmysql/libmysql.ver libmysql/my_static.h libmysql/my_time.c libmysql/mysys_priv.h @@ -443,6 +448,7 @@ libmysqld/sql_insert.cc libmysqld/sql_lex.cc libmysqld/sql_list.cc libmysqld/sql_load.cc +libmysqld/sql_locale.cc libmysqld/sql_manager.cc libmysqld/sql_map.cc libmysqld/sql_olap.cc @@ -1057,5 +1063,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -libmysql/libmysql.ver -libmysqld/sql_locale.cc |