diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-23 18:37:04 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-23 18:37:04 -0400 |
| commit | 1f49670a2ec222f27883460aa1aab656d69cfbe7 (patch) | |
| tree | 3cee46d796e50e973931d8443be220d3cd6f2e36 /.bzrignore | |
| parent | df4cbda0437b572ae151331cf4a1dda1b8f85d5e (diff) | |
| parent | 336250e60d57c9eba11ce141f3dc02f5e916ec50 (diff) | |
| download | mariadb-git-1f49670a2ec222f27883460aa1aab656d69cfbe7.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.0-maint
BitKeeper/etc/ignore:
auto-union
sql/gen_lex_hash.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 5e6c7509354..84713371ce8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -913,6 +913,7 @@ ndb/src/common/mgmcommon/printConfig/*.d ndb/src/common/portlib/libportlib.dsp ndb/src/common/transporter/libtransporter.dsp ndb/src/common/util/libgeneral.dsp +ndb/src/common/util/testBitmask.cpp ndb/src/cw/cpcd/ndb_cpcd ndb/src/dummy.cpp ndb/src/kernel/blocks/backup/libbackup.dsp @@ -1138,6 +1139,7 @@ sql/*.ds? sql/*.vcproj sql/.gdbinit sql/client.c +sql/f.c sql/gen_lex_hash sql/gmon.out sql/lex_hash.h @@ -1296,4 +1298,3 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj -ndb/src/common/util/testBitmask.cpp |