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


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged