From: Tor Didriksen Date: March 27 2012 8:25am Subject: bzr push into mysql-trunk branch (tor.didriksen:3865 to 3866) Bug#13880759 List-Archive: http://lists.mysql.com/commits/143325 X-Bug: 13880759 Message-Id: <201203270825.q2R8PdEU012980@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3866 Tor Didriksen 2012-03-27 Bug#13880759 BUILD IS BROKEN WHEN -DWITH_SSL=SYSTEM Previous patch broke it for WITH_SSL=NO Fixed #including my_global.h when it is actually needed. modified: include/my_md5.h 3865 Sunny Bains 2012-03-27 Fix file creation dates, non-functional change. modified: storage/innobase/api/api0api.cc storage/innobase/api/api0misc.cc storage/innobase/include/api0api.h === modified file 'include/my_md5.h' --- a/include/my_md5.h 2012-03-23 14:32:09 +0000 +++ b/include/my_md5.h 2012-03-27 08:25:06 +0000 @@ -62,6 +62,8 @@ do { \ bits instead of 64 is not important; speed is considerably more important. ANSI guarantees that "unsigned long" will be big enough, and always using it seems to have few disadvantages. */ + +#include "my_global.h" typedef uint32 cvs_uint32; typedef struct { No bundle (reason: useless for push emails).