into mysql.com:/home/timka/mysql/src/5.0-1972


sql/sql_base.cc:
  Auto merged