Commit e93dc829 authored by unknown's avatar unknown

Merge mysql.com:/M40/clone-4.0 into mysql.com:/M41/merge-4.1


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
parents 4fdf0ce3 a46d6b0c
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment