diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-06-28 20:03:46 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-06-28 20:03:46 +0300 |
| commit | 36daa4d97129d5e5a4f03a6bf4ae31afafaef16e (patch) | |
| tree | 1bfc8aa04338b5d1977347fc1984cddb5eaa98c6 /.bzrignore | |
| parent | e2bf3f0318b9b641127ff63c2f8e2b282554cf39 (diff) | |
| parent | e4f4f9dfa5d4c4eaea65820c947008a83cf07802 (diff) | |
| download | mariadb-git-36daa4d97129d5e5a4f03a6bf4ae31afafaef16e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
BitKeeper/etc/ignore:
auto-union
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index e07aa0cf86a..c90b5c651ab 100644 --- a/.bzrignore +++ b/.bzrignore @@ -7,6 +7,8 @@ *.d *.da *.exe +*.gcda +*.gcno *.gcov *.idb *.la |