• unknown's avatar
    Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb · a4d767cb
    unknown authored
    into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
    
    
    sql/ha_ndbcluster_cond.cc:
      Auto merged
    mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
      Auto merged
    mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
      Auto merged
    storage/ndb/include/kernel/signaldata/ScanTab.hpp:
      Auto merged
    storage/ndb/include/ndbapi/NdbScanFilter.hpp:
      Auto merged
    storage/ndb/include/ndbapi/ndbapi_limits.h:
      Auto merged
    storage/ndb/src/ndbapi/NdbScanFilter.cpp:
      Auto merged
    storage/ndb/src/ndbapi/NdbScanOperation.cpp:
      Auto merged
    storage/ndb/src/ndbapi/ndberror.c:
      ul, add code (4294) in post-merge
    storage/ndb/include/ndbapi/Ndb.hpp:
      SCCS merged
    a4d767cb
ndbapi_limits.h 1.15 KB