Commit f3172a89 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 97c3a273 1e84e31c

There are no changes