diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-11 09:34:02 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-11 09:34:02 +0200 |
| commit | 0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd (patch) | |
| tree | 4ac6f149a3e9c967fd1f3f99f651f4c5d6d6f7de /.bzrignore | |
| parent | 06f4523d79f7c8509c58e6bee4b84c6ead40fbb2 (diff) | |
| parent | c2d2ede33c4c67258676f26f7030ee3d79be5ef2 (diff) | |
| download | mariadb-git-0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
client/Makefile.am:
Merge
netware/Makefile.am:
Merge
sql/Makefile.am:
Merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 55f55faa0e6..4127fd23c01 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 @@ -379,6 +380,7 @@ client/mysqltestmanager-pwgen client/mysqltestmanagerc client/mysys_priv.h client/readline.cpp +client/rpl_constants.h client/select_test client/sql_string.cpp client/ssl_test @@ -574,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 @@ -749,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 @@ -1084,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 @@ -2956,4 +2961,3 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj -client/rpl_constants.h |