diff options
| author | unknown <jani@labbari.dsl.inet.fi> | 2007-07-06 13:49:15 +0300 |
|---|---|---|
| committer | unknown <jani@labbari.dsl.inet.fi> | 2007-07-06 13:49:15 +0300 |
| commit | d4e6d4b2c1fba6d198c1f02967dd1b038a092068 (patch) | |
| tree | 9de604cc4c8279aefe5b1ea4f873aef6f2ca9cbe /.bzrignore | |
| parent | 48782e344c4410ad05ac0a2244aff7c943aa3c39 (diff) | |
| parent | 0b24005753b8ddc05827aa29744f75a8538bfeba (diff) | |
| download | mariadb-git-d4e6d4b2c1fba6d198c1f02967dd1b038a092068.tar.gz | |
Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
into labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel
BitKeeper/etc/ignore:
auto-union
libmysql/libmysql.c:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/include/mix1.inc:
Manual merge from 5.0
storage/innobase/handler/ha_innodb.cc:
Manual merge from 5.0
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index bc7a7a6429d..329c5e227ca 100644 --- a/.bzrignore +++ b/.bzrignore @@ -38,9 +38,9 @@ */.libs/* */.pure */debug/* +*/minsizerel/* */release/* */relwithdebinfo/* -*/minsizerel/* *~ .*.swp ./CMakeCache.txt @@ -584,6 +584,7 @@ heap/hp_test2 help help.c help.h +include/abi_check include/check_abi include/link_sources include/my_config.h @@ -1021,8 +1022,8 @@ libmysqld/.deps/unireg.Po libmysqld/backup_dir libmysqld/client.c libmysqld/client_settings.h -libmysqld/convert.cc libmysqld/cmake_dummy.c +libmysqld/convert.cc libmysqld/derror.cc libmysqld/discover.cc libmysqld/emb_qcache.cpp |