Commit e21cdc61 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  manual merge
parents 3f3d9093 6acbe4eb

mysql-test/r/ndb_read_multi_range.result

+17 −0
Original line number Diff line number Diff line
@@ -442,3 +442,20 @@ SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila'); 
id	tag	doc	type

sakila	1	Some text goes here	text

DROP TABLE t1;

CREATE TABLE t1 (

var1 int(2) NOT NULL,

var2 int(2) NOT NULL,

PRIMARY KEY  (var1)

) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;

CREATE TABLE t2 (

var1 int(2) NOT NULL,

var2 int(2) NOT NULL,

PRIMARY KEY  (var1)

) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;

CREATE TRIGGER testtrigger

AFTER UPDATE ON t1 FOR EACH ROW BEGIN

REPLACE INTO t2 SELECT * FROM t1 WHERE t1.var1 = NEW.var1;END|

INSERT INTO t1 VALUES (1,1),(2,2),(3,3);

UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);

DROP TRIGGER testtrigger;

DROP TABLE t1, t2;

mysql-test/t/ndb_read_multi_range.test

+29 −0
Original line number Diff line number Diff line
@@ -272,3 +272,32 @@ SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','orka'); 
SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila');



DROP TABLE t1;



#bug#25522

CREATE TABLE t1 (

       var1 int(2) NOT NULL,

       var2 int(2) NOT NULL,

       PRIMARY KEY  (var1)

     ) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;





CREATE TABLE t2 (

       var1 int(2) NOT NULL,

       var2 int(2) NOT NULL,

       PRIMARY KEY  (var1)

     ) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;





DELIMITER |;

CREATE TRIGGER testtrigger

     AFTER UPDATE ON t1 FOR EACH ROW BEGIN

     REPLACE INTO t2 SELECT * FROM t1 WHERE t1.var1 = NEW.var1;END|

DELIMITER ;|



INSERT INTO t1 VALUES (1,1),(2,2),(3,3);



UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);



DROP TRIGGER testtrigger;



DROP TABLE t1, t2;

sql/ha_ndbcluster.cc

+18 −16
Original line number Diff line number Diff line
@@ -260,13 +260,14 @@ static int ndb_to_mysql_error(const NdbError *ndberr) 
int execute_no_commit_ignore_no_key(ha_ndbcluster *h, NdbTransaction *trans)

{

  int res= trans->execute(NdbTransaction::NoCommit,

                          NdbTransaction::AO_IgnoreError,

                          NdbOperation::AO_IgnoreError,

                          h->m_force_send);

  if (res == 0)

    return 0;

  if (res == -1)

    return -1;



  const NdbError &err= trans->getNdbError();

  if (err.classification != NdbError::ConstraintViolation &&

  if (err.classification != NdbError::NoError &&

      err.classification != NdbError::ConstraintViolation &&

      err.classification != NdbError::NoDataFound)

    return res;
@@ -286,7 +287,7 @@ int execute_no_commit(ha_ndbcluster *h, NdbTransaction *trans, 
  return h->m_ignore_no_key ?

    execute_no_commit_ignore_no_key(h,trans) :

    trans->execute(NdbTransaction::NoCommit,

		   NdbTransaction::AbortOnError,

		   NdbOperation::AbortOnError,

		   h->m_force_send);

}
@@ -299,7 +300,7 @@ int execute_commit(ha_ndbcluster *h, NdbTransaction *trans) 
    return 0;

#endif

  return trans->execute(NdbTransaction::Commit,

                        NdbTransaction::AbortOnError,

                        NdbOperation::AbortOnError,

                        h->m_force_send);

}
@@ -312,7 +313,7 @@ int execute_commit(THD *thd, NdbTransaction *trans) 
    return 0;

#endif

  return trans->execute(NdbTransaction::Commit,

                        NdbTransaction::AbortOnError,

                        NdbOperation::AbortOnError,

                        thd->variables.ndb_force_send);

}
@@ -327,7 +328,7 @@ int execute_no_commit_ie(ha_ndbcluster *h, NdbTransaction *trans, 
#endif

  h->release_completed_operations(trans, force_release);

  return trans->execute(NdbTransaction::NoCommit,

                        NdbTransaction::AO_IgnoreError,

                        NdbOperation::AO_IgnoreError,

                        h->m_force_send);

}
@@ -1726,7 +1727,8 @@ int ha_ndbcluster::pk_read(const byte *key, uint key_len, byte *buf, 
      ERR_RETURN(trans->getNdbError());

  }



  if (execute_no_commit_ie(this,trans,FALSE) != 0) 

  if ((res = execute_no_commit_ie(this,trans,FALSE)) != 0 ||

      op->getNdbError().code) 

  {

    table->status= STATUS_NOT_FOUND;

    DBUG_RETURN(ndb_err(trans));
@@ -1998,7 +2000,8 @@ int ha_ndbcluster::unique_index_read(const byte *key, 
  if ((res= define_read_attrs(buf, op)))

    DBUG_RETURN(res);



  if (execute_no_commit_ie(this,trans,FALSE) != 0) 

  if (execute_no_commit_ie(this,trans,FALSE) != 0 ||

      op->getNdbError().code) 

  {

    table->status= STATUS_NOT_FOUND;

    DBUG_RETURN(ndb_err(trans));
@@ -4337,11 +4340,10 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type) 
      ERR_RETURN(ndb->getNdbError());

    no_uncommitted_rows_reset(thd);

    thd_ndb->stmt= trans;

    thd_ndb->query_state&= NDB_QUERY_NORMAL;

    trans_register_ha(thd, FALSE, ndbcluster_hton);

  }

  thd_ndb->query_state&= NDB_QUERY_NORMAL;

  m_active_trans= trans;



  // Start of statement

  m_ops_pending= 0;    

  thd->set_current_stmt_binlog_row_based_if_mixed();
@@ -7800,7 +7802,7 @@ ndb_get_table_statistics(ha_ndbcluster* file, bool report_error, Ndb* ndb, const 
		  (char*)&var_mem);

    

    if (pTrans->execute(NdbTransaction::NoCommit,

                        NdbTransaction::AbortOnError,

                        NdbOperation::AbortOnError,

                        TRUE) == -1)

    {

      error= pTrans->getNdbError();
@@ -8057,7 +8059,6 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, 
          !op->readTuple(lm) && 

          !set_primary_key(op, multi_range_curr->start_key.key) &&

          !define_read_attrs(curr, op) &&

          (op->setAbortOption(AO_IgnoreError), TRUE) &&

          (!m_use_partition_function ||

           (op->setPartitionId(part_spec.start_part), TRUE)))

        curr += reclength;
@@ -8079,8 +8080,7 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, 
      if ((op= m_active_trans->getNdbIndexOperation(unique_idx, tab)) && 

          !op->readTuple(lm) && 

          !set_index_key(op, key_info, multi_range_curr->start_key.key) &&

          !define_read_attrs(curr, op) &&

          (op->setAbortOption(AO_IgnoreError), TRUE))

          !define_read_attrs(curr, op))

        curr += reclength;

      else

        ERR_RETURN(op ? op->getNdbError() : m_active_trans->getNdbError());
@@ -8280,6 +8280,8 @@ ha_ndbcluster::read_multi_range_next(KEY_MULTI_RANGE ** multi_range_found_p) 
  if (multi_range_curr == multi_range_end)

  {

    DBUG_MULTI_RANGE(16);

    Thd_ndb *thd_ndb= get_thd_ndb(current_thd);

    thd_ndb->query_state&= NDB_QUERY_NORMAL;

    DBUG_RETURN(HA_ERR_END_OF_FILE);

  }

sql/ha_ndbcluster_binlog.cc

+2 −2
Original line number Diff line number Diff line
@@ -3924,9 +3924,9 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
                              "%ld(%d e/s), total time %ld(%d e/s)",

                              (ulong)gci, event_count,

                              write_timer.elapsed_ms(),

                              event_count / write_timer.elapsed_ms(),

                              (1000*event_count) / write_timer.elapsed_ms(),

                              gci_timer.elapsed_ms(),

                              event_count / gci_timer.elapsed_ms());

                              (1000*event_count) / gci_timer.elapsed_ms());

#endif

      }

    }

sql/log_event.cc

+20 −3
Original line number Diff line number Diff line
@@ -5701,10 +5701,27 @@ int Rows_log_event::exec_event(st_relay_log_info *rli) 
                               rli->tables_to_lock_count, &need_reopen)))

    {

      if (!need_reopen)

      {

        if (thd->query_error || thd->is_fatal_error)

        {

          /*

            Error reporting borrowed from Query_log_event with many excessive

            simplifications (we don't honour --slave-skip-errors)

          */

          uint actual_error= thd->net.last_errno;

          slave_print_msg(ERROR_LEVEL, rli, actual_error,

                          "Error '%s' in %s event: when locking tables",

                          (actual_error ? thd->net.last_error :

                           "unexpected success or fatal error"),

                          get_type_str());

          thd->is_fatal_error= 1;

        }

        else

        {

          slave_print_msg(ERROR_LEVEL, rli, error,

                         "Error in %s event: when locking tables",

                         get_type_str());

        }

        rli->clear_tables_to_lock();

        DBUG_RETURN(error);

      }