diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-23 18:29:44 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-23 18:29:44 -0400 |
| commit | f98d253d70980c8093049624e5fe49921501d743 (patch) | |
| tree | 82ca29898b5782c8eeba5c39f97741b2e3d4beb1 /.bzrignore | |
| parent | d4e12210ad082f6c2f84325978cb911a04fec8b5 (diff) | |
| parent | 336250e60d57c9eba11ce141f3dc02f5e916ec50 (diff) | |
| download | mariadb-git-f98d253d70980c8093049624e5fe49921501d743.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
sql/gen_lex_hash.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 1cf0cf7b889..095c8bb7390 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1170,6 +1170,7 @@ sql/*.ds? sql/*.vcproj sql/.gdbinit sql/client.c +sql/f.c sql/gen_lex_hash sql/gmon.out sql/handlerton.cc |