into mysql.com:/usr/home/ram/work/mysql-5.0
myisam/mi_check.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/mi_static.c:
Auto merged
myisam/myisamdef.h:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/vm/Emulator.cpp:
Auto merged
myisam/myisampack.c:
merging