Commit 18645472 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


sql/item_func.cc:
  Auto merged
parents 4f12094f 02c6bc38

mysql-test/r/ndb_basic.result

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ t1 
insert into t1 values (1,1),(2,1),(3,1),(4,1),(5,2),(6,1),(7,1);

explain select * from t1 where a12345678901234567890123456789a1234567890=2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	a12345678901234567890123456789a1234567890	a12345678901234567890123456789a1234567890	5	const	#	Using where

1	SIMPLE	t1	ref	a12345678901234567890123456789a1234567890	a12345678901234567890123456789a1234567890	5	const	#	Using where with pushed condition

select * from t1 where a12345678901234567890123456789a1234567890=2;

a1234567890123456789012345678901234567890	a12345678901234567890123456789a1234567890

5	2

mysql-test/r/ndb_blob.result

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ insert into t1 values(9,'b9',999,'dd9'); 
commit;

explain select * from t1 where c >= 100 order by a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	c	c	4	NULL	#	Using where; Using filesort

1	SIMPLE	t1	range	c	c	4	NULL	#	Using where with pushed condition; Using filesort

select * from t1 where c >= 100 order by a;

a	b	c	d

1	b1	111	dd1
@@ -278,7 +278,7 @@ insert into t1 values(2,@b2,222,@d2); 
commit;

explain select * from t1 where c >= 100 order by a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	c	c	4	NULL	#	Using where; Using filesort

1	SIMPLE	t1	range	c	c	4	NULL	#	Using where with pushed condition; Using filesort

select a,length(b),substr(b,1+2*900,2),length(d),substr(d,1+3*900,3)

from t1 where c >= 100 order by a;

a	length(b)	substr(b,1+2*900,2)	length(d)	substr(d,1+3*900,3)

sql/ha_ndbcluster.cc

+6 −7
Original line number Diff line number Diff line
@@ -259,17 +259,16 @@ 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,

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

                     NdbOperation::AO_IgnoreError,

                          h->m_force_send);

  if (res == -1)

                     h->m_force_send) == -1)

    return -1;



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

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

      err.classification != NdbError::ConstraintViolation &&

      err.classification != NdbError::NoDataFound)

    return res;

    return -1;



  return 0;

}
@@ -3811,7 +3810,7 @@ int ha_ndbcluster::info(uint flag) 
  if (flag & HA_STATUS_AUTO)

  {

    DBUG_PRINT("info", ("HA_STATUS_AUTO"));

    if (m_table)

    if (m_table && table->found_next_number_field)

    {

      Ndb *ndb= get_ndb();

      Ndb_tuple_id_range_guard g(m_share);
@@ -9052,7 +9051,7 @@ void ndb_serialize_cond(const Item *item, void *arg) 
            Check that the field is part of the table of the handler

            instance and that we expect a field with of this result type.

          */

          if (context->table == field->table)

          if (context->table->s == field->table->s)

          {       

            const NDBTAB *tab= (const NDBTAB *) context->ndb_table;

            DBUG_PRINT("info", ("FIELD_ITEM"));

sql/item_func.cc

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,8 @@ void Item_func::traverse_cond(Cond_traverser traverser, 
      (*traverser)(this, argument);

    }

  }

  else

    (*traverser)(this, argument);

}

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5072,7 +5072,7 @@ struct my_option my_long_options[] = 
   "Push supported query conditions to the storage engine.",

   (gptr*) &global_system_variables.engine_condition_pushdown,

   (gptr*) &global_system_variables.engine_condition_pushdown,

   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

   0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  /* See how it's handled in get_one_option() */

  {"event-scheduler", OPT_EVENT_SCHEDULER, "Enable/disable the event scheduler.",

   NULL,  NULL, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},