diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-07-07 15:17:25 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-07-07 15:17:25 -0600 |
commit | 5d63584e60c21c319b2b54292b71e5f9eff76c6e (patch) | |
tree | 28713fd6fc310a091536efab68f689c34426cdd0 /.bzrignore | |
parent | fde78d995acca36cb353151604de5a12c2299361 (diff) | |
parent | 502806cd50428e8c435d3f9512b89d6732c4b86a (diff) | |
download | mariadb-git-5d63584e60c21c319b2b54292b71e5f9eff76c6e.tar.gz |
merged
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
sql/mysqld.cc:
Auto merged
sql/share/spanish/errmsg.txt:
merged and translated the new 4.0 errors - had to type them in
anyway so figured I'd do it in Spanish - Jorge/Miguel - can you do QA
on my translation?
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 6065c54ef28..b27d8529cda 100644 --- a/.bzrignore +++ b/.bzrignore @@ -281,6 +281,8 @@ myisam/mi_test_all myisam/myisamchk myisam/myisamlog myisam/myisampack +myisam/test1.MYD +myisam/test1.MYI mysql-test/gmon.out mysql-test/install_test_db mysql-test/mysql-test-run |