into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999


mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field.cc:
  Auto merged