diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-07 10:14:28 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-07 10:14:28 -0700 |
| commit | 4512b01c313047f80866530d4961a47aa8a89e9b (patch) | |
| tree | 2fe182138b57b76e007f1481b3b85644cadfe3d5 /.bzrignore | |
| parent | 3e9523d2fa4bcc023a8c05b8ffac17fb17aefd7a (diff) | |
| download | mariadb-git-4512b01c313047f80866530d4961a47aa8a89e9b.tar.gz | |
ok, here comes the push - prepare to resolve conflicts! And lets hope bk can gracefully handle all of my renames
BitKeeper/etc/ignore:
Added mysql-test/var/lib/test/test3.frm mysql-test/var/lib/test/test3.MRG to the ignore list
mysql-test/t/mrg000001.test:
fixed paths
sql/log.cc:
fixed mutex problem
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 24581b5b5b7..9b4c9558025 100644 --- a/.bzrignore +++ b/.bzrignore @@ -408,3 +408,5 @@ BitKeeper/etc/config BitKeeper/tmp/CONTENTS BitKeeper/tmp/patch BitKeeper/tmp/pid +mysql-test/var/lib/test/test3.frm +mysql-test/var/lib/test/test3.MRG |