into kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010 mysys/mf_iocache.c: Auto merged mysys/my_seek.c: Auto merged