Merge bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/ignore:
  added support-files/my-innodb-heavy-4G.cnf
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2004-08-24 21:07:08 +02:00
commit d5996e18ed
19 changed files with 325 additions and 62 deletions

View file

@ -907,3 +907,4 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
support-files/my-innodb-heavy-4G.cnf