Merge chilla.local:/home/mydev/mysql-4.1-merge

into  chilla.local:/home/mydev/mysql-5.0-merge


include/my_sys.h:
  Auto merged
sql/sql_select.cc:
  Auto merged