Commit 0e5fee5d authored by unknown's avatar unknown
Browse files

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
parents 554aaed3 a4a09cd2

There are no changes