Commit 035d92f4 authored by unknown's avatar unknown
Browse files

Merge 


sql/sql_show.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
parents 599a7842 ab600d16

mysql-test/r/ndb_blob.result

+5 −0
Original line number Diff line number Diff line
@@ -397,4 +397,9 @@ select * from t1 order by a; 
a	b

1	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2	BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB

alter table t1 engine=myisam;

select * from t1 order by a;

a	b

1	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

2	BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB

drop table t1;

mysql-test/t/ndb_blob.test

+5 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ select count(*) from t1; 
drop table t1;

drop database mysqltest;



# bug #5349

set autocommit=1;

use test;

CREATE TABLE t1 (
@@ -325,4 +326,8 @@ INSERT INTO t1 VALUES 
select * from t1 order by a;

alter table t1 engine=ndb;

select * from t1 order by a;



# bug #5872

alter table t1 engine=myisam;

select * from t1 order by a;

drop table t1;

sql/ha_ndbcluster.cc

+16 −13
Original line number Diff line number Diff line
@@ -1195,18 +1195,21 @@ inline int ha_ndbcluster::next_result(byte *buf) 
	be sent to NDB

      */

      DBUG_PRINT("info", ("ops_pending: %d", ops_pending));    

      if (ops_pending)

      {

	if (current_thd->transaction.on)

	{

	if (ops_pending && (execute_no_commit(this,trans) != 0))

	  if (execute_no_commit(this,trans) != 0)

	    DBUG_RETURN(ndb_err(trans));

	}

	else

	{

	if (ops_pending && (execute_commit(this,trans) != 0))

	  if  (execute_commit(this,trans) != 0)

	    DBUG_RETURN(ndb_err(trans));

	trans->restart();

	  DBUG_ASSERT(trans->restart() == 0);

	}

	ops_pending= 0;

      }

      

      contact_ndb= (check == 2);

    }
@@ -1641,7 +1644,7 @@ int ha_ndbcluster::write_row(byte *record) 
	no_uncommitted_rows_execute_failure();

	DBUG_RETURN(ndb_err(trans));

      }

      trans->restart();

      DBUG_ASSERT(trans->restart() == 0);

    }

  }

  if ((has_auto_increment) && (skip_auto_increment))
@@ -2278,7 +2281,7 @@ int ha_ndbcluster::rnd_init(bool scan) 
  {

    if (!scan)

      DBUG_RETURN(1);

    cursor->restart();    

    DBUG_ASSERT(cursor->restart() == 0);

  }

  index_init(table->primary_key);

  DBUG_RETURN(0);

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -1999,7 +1999,7 @@ bool Item_ref::fix_fields(THD *thd,TABLE_LIST *tables, Item **reference) 
      }

      else if (tmp != not_found_field)

      {

	ref= 0; // To prevent "delete *ref;" on ~Item_erf() of this item

	ref= 0; // To prevent "delete *ref;" on ~Item_ref() of this item

	Item_field* fld;

	if (!((*reference)= fld= new Item_field(tmp)))

	  return 1;

sql/sql_class.h

+0 −2
Original line number Diff line number Diff line
@@ -1264,8 +1264,6 @@ class select_subselect :public select_result 
  bool send_fields(List<Item> &list, uint flag) { return 0; };

  bool send_data(List<Item> &items)=0;

  bool send_eof() { return 0; };



  friend class Ttem_subselect;

};



/* Single value subselect interface class */