diff options
| author | jani@labbari.dsl.inet.fi <> | 2007-07-06 13:49:15 +0300 |
|---|---|---|
| committer | jani@labbari.dsl.inet.fi <> | 2007-07-06 13:49:15 +0300 |
| commit | 12a7af372874515d9cce992c3f58700ddc43469e (patch) | |
| tree | 9de604cc4c8279aefe5b1ea4f873aef6f2ca9cbe /.bzrignore | |
| parent | 0a1c65b6e3fe1f3cec4aa8a6cea0dd4acb51887a (diff) | |
| parent | 7d7524d94d6f2c682ba4a974622df770bc2b5d6c (diff) | |
| download | mariadb-git-12a7af372874515d9cce992c3f58700ddc43469e.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
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 |