commit e5f7c69c5ce2a2eed2446b476acd8aaecc3a229a
Merge: ed2536c ae298e2
Author: V S Murthy Sidagam <venkata.sidagam@oracle.com>
Date:   Wed Apr 29 13:52:25 2015 +0530

    Merge branch 'mysql-5.5' into mysql-5.6

commit ae298e24fe51a8d95c4036bd95055fb2bfe42f31
Author: V S Murthy Sidagam <venkata.sidagam@oracle.com>
Date:   Wed Apr 29 13:51:29 2015 +0530

    Bug #18592390 QUERY TO I_S.TABLES AND I_S.COLUMNS LEADS TO HUGE MEMORY USAGE

    As part of the fix find_files() prototype has been modified and
    mysql-cluster uses find_files() function. Hence modified find_files() call
    in ha_ndbcluster_binlog.cc file to make mysql-cluster build successful.