diff options
| author | unknown <cmiller@zippy.(none)> | 2006-06-13 16:06:35 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.(none)> | 2006-06-13 16:06:35 -0400 |
| commit | 4b639b6c58c2dacb449118e29fc480aca9a6fe48 (patch) | |
| tree | 8719a5a0706de5334b4142c3a7f4efeec5419444 /.bzrignore | |
| parent | dd02c9d2e43487b51f84c06f3d3232557953f431 (diff) | |
| parent | 6a46bf820d3cef208d4bd5986def30a967bd7710 (diff) | |
| download | mariadb-git-4b639b6c58c2dacb449118e29fc480aca9a6fe48.tar.gz | |
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
BitKeeper/etc/ignore:
auto-union
client/mysql.cc:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/table.cc:
Null-merged, as this doesn't apply after 5.1.4 . -cm
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 835e4b2c357..25056b86642 100644 --- a/.bzrignore +++ b/.bzrignore @@ -278,6 +278,7 @@ bkpush.log bkpush.log* build.log build_tags.sh +client/#mysql.cc# client/*.ds? client/*.vcproj client/completion_hash.cpp @@ -1181,7 +1182,9 @@ sql/pack.c sql/safe_to_cache_query.txt sql/share/*.sys sql/share/charsets/gmon.out +sql/share/fixerrmsg.pl sql/share/gmon.out +sql/share/iso639-2.txt sql/share/mysql sql/share/norwegian-ny/errmsg.sys sql/share/norwegian/errmsg.sys |