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

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

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
parents f150f86d c5ebeb79

mysql-test/r/ndb_basic.result

+16 −0
Original line number Diff line number Diff line
@@ -677,3 +677,19 @@ select * from atablewithareallylongandirritatingname; 
a

2

drop table atablewithareallylongandirritatingname;

create table t1 (f1 varchar(50), f2 text,f3 int, primary key(f1)) engine=NDB;

insert into t1 (f1,f2,f3)VALUES("111111","aaaaaa",1);

insert into t1 (f1,f2,f3)VALUES("222222","bbbbbb",2);

select * from t1 order by f1;

f1	f2	f3

111111	aaaaaa	1

222222	bbbbbb	2

select * from t1 order by f2;

f1	f2	f3

111111	aaaaaa	1

222222	bbbbbb	2

select * from t1 order by f3;

f1	f2	f3

111111	aaaaaa	1

222222	bbbbbb	2

drop table t1;

mysql-test/t/ndb_basic.test

+11 −0
Original line number Diff line number Diff line
@@ -623,3 +623,14 @@ create table atablewithareallylongandirritatingname (a int); 
insert into atablewithareallylongandirritatingname values (2);

select * from atablewithareallylongandirritatingname;

drop table atablewithareallylongandirritatingname;



#

# Bug#15682

#

create table t1 (f1 varchar(50), f2 text,f3 int, primary key(f1)) engine=NDB;

insert into t1 (f1,f2,f3)VALUES("111111","aaaaaa",1);

insert into t1 (f1,f2,f3)VALUES("222222","bbbbbb",2);

select * from t1 order by f1;

select * from t1 order by f2;

select * from t1 order by f3;

drop table t1;

sql/ha_ndbcluster.cc

+20 −2
Original line number Diff line number Diff line
@@ -3014,8 +3014,26 @@ void ha_ndbcluster::position(const byte *record) 
        }      

        *buff++= 0;

      }

      memcpy(buff, record + key_part->offset, key_part->length);

      buff += key_part->length;



      size_t len = key_part->length;

      const byte * ptr = record + key_part->offset;

      Field *field = key_part->field;

      if ((field->type() ==  MYSQL_TYPE_VARCHAR) &&

	  ((Field_varstring*)field)->length_bytes == 1)

      {

	/** 

	 * Keys always use 2 bytes length

	 */

	buff[0] = ptr[0];

	buff[1] = 0;

	memcpy(buff+2, ptr + 1, len);	

	len += 2;

      }

      else

      {

	memcpy(buff, ptr, len);

      }

      buff += len;

    }

  } 

  else

storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp

+2 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ 
#define ZALREADYEXIST 630

#define ZINCONSISTENTHASHINDEX 892

#define ZNOTUNIQUE 893



#define ZINVALID_KEY 290

#endif



class Dbtc: public SimulatedBlock {

storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

+16 −1
Original line number Diff line number Diff line
@@ -2314,7 +2314,10 @@ Dbtc::handle_special_hash(Uint32 dstHash[4], Uint32* src, Uint32 srcLen, 
  {

    keyPartLenPtr = keyPartLen;

    dstPos = xfrm_key(tabPtrI, src, dst, sizeof(Tmp) >> 2, keyPartLenPtr);

    ndbrequire(dstPos);

    if (unlikely(dstPos == 0))

    {

      goto error;

    }

  } 

  else 

  {
@@ -2335,6 +2338,10 @@ Dbtc::handle_special_hash(Uint32 dstHash[4], Uint32* src, Uint32 srcLen, 
    dstHash[1] = tmp[1];

  }

  return true;  // success



error:

  terrorCode = ZINVALID_KEY;

  return false;

}



/*
@@ -2944,8 +2951,16 @@ void Dbtc::tckeyreq050Lab(Signal* signal) 
  UintR tnoOfStandby;

  UintR tnodeinfo;



  terrorCode = 0;



  hash(signal); /* NOW IT IS TIME TO CALCULATE THE HASH VALUE*/

  

  if (unlikely(terrorCode))

  {

    releaseAtErrorLab(signal);

    return;

  }



  CacheRecord * const regCachePtr = cachePtr.p;

  TcConnectRecord * const regTcPtr = tcConnectptr.p;

  ApiConnectRecord * const regApiPtr = apiConnectptr.p;