diff options
author | unknown <sasha@mysql.sashanet.com> | 2000-11-24 19:49:54 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2000-11-24 19:49:54 -0700 |
commit | 32ea94df54dee8cb91ca52d2b7522c90642f68c9 (patch) | |
tree | 96ea4119f650adb324e76291176d8430a3d1e669 /.bzrignore | |
parent | 177bfa0b28bbfc8307eb03da6cecfcf459cc2b8b (diff) | |
parent | e56c95366bebd2499731a5e4bf6a28278d496a29 (diff) | |
download | mariadb-git-32ea94df54dee8cb91ca52d2b7522c90642f68c9.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
BitKeeper/etc/logging_ok:
Auto converge
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 79307b9312c..f3dace8599d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -276,3 +276,7 @@ mysql-test/var/slave-data/test/choo.MYI mysql-test/var/tmp/README BitKeeper/tmp/bkOF1wtJ scripts/mysqldumpslow +mysql-test/rpl000011.test +mysql-test/var/lib/mysql-bin.007 +sql/share/norwegian/errmsg.sys +sql/share/norwegian-ny/errmsg.sys |