Commit 05e26b12 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M41/merge-4.1 into mysql.com:/M50/merge-5.0 


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
parents e8ba23fd e93dc829

There are no changes