diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-16 14:51:55 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-04-16 14:51:55 +0200 |
| commit | 15a2bbd3cab194baa898116b14dbd369810a25ff (patch) | |
| tree | 3ee4674c5f5e205b8b079d50f0baa63c5769f785 /.bzrignore | |
| parent | ed024c024d0f7d0e392752a426eacb3b697bc829 (diff) | |
| parent | 8a4f717dfe87219281be020cc8d5f11f16d9e8f4 (diff) | |
| download | mariadb-git-15a2bbd3cab194baa898116b14dbd369810a25ff.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-configure.in.rej:
Auto merged
configure.in:
Auto merged
sql/item.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index b5ec5aea79d..efa1a272b39 100644 --- a/.bzrignore +++ b/.bzrignore @@ -352,6 +352,7 @@ client/.libs/mysqltest client/completion_hash.cpp client/decimal.c client/insert_test +client/link_sources client/log_event.cc client/log_event.h client/mf_iocache.c @@ -575,6 +576,7 @@ help help.c help.h include/check_abi +include/link_sources include/my_config.h include/my_global.h include/mysql_h.ic @@ -750,6 +752,7 @@ libmysql/.libs/libmysqlclient.so.15.0.0 libmysql/conf_to_src libmysql/debug/libmysql.exp libmysql/libmysql.ver +libmysql/link_sources libmysql/my_static.h libmysql/my_time.c libmysql/mysys_priv.h @@ -1085,6 +1088,7 @@ libmysqld/item_uniq.cc libmysqld/key.cc libmysqld/lib_sql.cpp libmysqld/libmysql.c +libmysqld/link_sources libmysqld/lock.cc libmysqld/log.cc libmysqld/log_event.cc |