Manual merge of the 4.0.24 compile changes into the 4.1 tree.
include/my_sys.h: Auto merged mysys/hash.c: Manually merged: 'static' for all, 'inline' for most platforms.
Showing
Please register or sign in to comment
include/my_sys.h: Auto merged mysys/hash.c: Manually merged: 'static' for all, 'inline' for most platforms.