Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql

BitKeeper/etc/ignore:
  added sql-bench/output/*
Docs/manual.texi:
  Auto merged
This commit is contained in:
unknown 2000-12-26 17:35:48 +02:00
commit 74bb64d304
7 changed files with 262 additions and 100 deletions

View file

@ -181,3 +181,5 @@ mysql-test/mysql-test-run
BitKeeper/tmp/gone
mysqld.S
mysqld.sym
.snprj/*
sql-bench/output/*