Commit 2bb6cec5 authored by unknown's avatar unknown
Browse files

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj 

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
parents 774a1955 e320fd78

storage/ndb/src/ndbapi/NdbScanFilter.cpp

+8 −2
Original line number Diff line number Diff line
@@ -328,11 +328,17 @@ NdbScanFilterImpl::cond_col(Interpreter::UnaryCondition op, Uint32 AttrId){ 


int

NdbScanFilter::isnull(int AttrId){

  if(m_impl.m_negative == 1)

    return m_impl.cond_col(Interpreter::IS_NOT_NULL, AttrId);

  else

    return m_impl.cond_col(Interpreter::IS_NULL, AttrId);

}



int

NdbScanFilter::isnotnull(int AttrId){

  if(m_impl.m_negative == 1)

    return m_impl.cond_col(Interpreter::IS_NULL, AttrId);

  else

    return m_impl.cond_col(Interpreter::IS_NOT_NULL, AttrId);

}