into rama.(none):/home/jimw/my/mysql-5.0-clean include/my_global.h: Auto merged
Attach a file by drag & drop or click to upload
