Commit 84e89916 authored by unknown's avatar unknown
Browse files

Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build


configure.in:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 44318bbb 50361d9a

There are no changes