diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-06-29 00:09:53 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-06-29 00:09:53 +0300 |
| commit | 373593c7d24a34581e151e19aa5f94a8827a0ca0 (patch) | |
| tree | 0c1b53bf45f6831d4ae755dc2396222efcf4118a /.bzrignore | |
| parent | fa99e3471594f99ad273c8f6a899a02a2e30762f (diff) | |
| parent | 36daa4d97129d5e5a4f03a6bf4ae31afafaef16e (diff) | |
| download | mariadb-git-373593c7d24a34581e151e19aa5f94a8827a0ca0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
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 |