Commit bb8fb9e9 authored by unknown's avatar unknown
Browse files

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

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents b651aa03 5203ea6c

mysql-test/r/ndb_autodiscover.result

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ create table t1 (a int primary key) engine=ndb; 
select * from t1;

a

select * from t1;

ERROR HY000: Can't lock file (errno: 4009)

ERROR HY000: Can't lock file (errno: 157)

use test;

drop database test_only_ndb_tables;

CREATE TABLE t9 (

ndb/src/common/transporter/TCP_Transporter.cpp

+7 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ TCP_Transporter::initTransporter() { 


void

TCP_Transporter::setSocketOptions(){

  int sockOptKeepAlive  = 1;



  if (setsockopt(theSocket, SOL_SOCKET, SO_RCVBUF,

                 (char*)&sockOptRcvBufSize, sizeof(sockOptRcvBufSize)) < 0) {

#ifdef DEBUG_TRANSPORTER
@@ -169,6 +171,11 @@ TCP_Transporter::setSocketOptions(){ 
#endif

  }//if

  

  if (setsockopt(theSocket, SOL_SOCKET, SO_KEEPALIVE,

                 (char*)&sockOptKeepAlive, sizeof(sockOptKeepAlive)) < 0) {

    ndbout_c("The setsockopt SO_KEEPALIVE error code = %d", InetErrno);

  }//if



  //-----------------------------------------------

  // Set the TCP_NODELAY option so also small packets are sent

  // as soon as possible

ndb/src/mgmclient/CommandInterpreter.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2026,6 +2026,9 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list, 
    return -1;

  }



  if (!nostart)

    ndbout_c("Shutting down nodes with \"-n, no start\" option, to subsequently start the nodes.");



  result= ndb_mgm_restart3(m_mgmsrv, no_of_nodes, node_ids,

                           initialstart, nostart, abort, &need_disconnect);

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);

}

sql/ha_ndbcluster.cc

+5 −6
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ static const err_code_mapping err_map[]= 


  { 284, HA_ERR_TABLE_DEF_CHANGED, 0 },



  {4009, HA_ERR_NO_CONNECTION, 1 },



  { 0, 1, 0 },



  { -1, -1, 1 }
@@ -5068,14 +5070,11 @@ int ndbcluster_table_exists_in_engine(THD* thd, const char *db, const char *name 
  dict->invalidateTable(name);

  if (!(tab= dict->getTable(name)))

  {

    const NdbError err= dict->getNdbError();

    if (err.code == 709)

      DBUG_RETURN(0);

    ERR_RETURN(err);

    ERR_RETURN(dict->getNdbError());

  }



  DBUG_PRINT("info", ("Found table %s", tab->getName()));

  DBUG_RETURN(1);

  DBUG_RETURN(HA_ERR_TABLE_EXIST);

}
@@ -5260,7 +5259,7 @@ int ndbcluster_find_files(THD *thd,const char *db,const char *path, 
    DBUG_PRINT("info", ("%s existed on disk", name));     

    // The .ndb file exists on disk, but it's not in list of tables in ndb

    // Verify that handler agrees table is gone.

    if (ndbcluster_table_exists_in_engine(thd, db, file_name) == 0)    

    if (ndbcluster_table_exists_in_engine(thd, db, file_name) == HA_ERR_NO_SUCH_TABLE)

    {

      DBUG_PRINT("info", ("NDB says %s does not exists", file_name));     

      it.remove();