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
This commit is contained in:
unknown 2006-09-23 07:37:41 +02:00
commit f3172a8957

Diff Content Not Available