Commit 536a1cd1 authored by unknown's avatar unknown
Browse files

merged 


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ul
parents f1f1d39a c23524c7

mysql-test/r/bdb_cache.result

+1 −3
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ show status like "Qcache_queries_in_cache"; 
Variable_name	Value

Qcache_queries_in_cache	0

drop table t1;

commit;

set autocommit=1;

begin;

create table t1 (a int not null) engine=bdb;

begin;

insert into t1 values (1),(2),(3);

select * from t1;

a
@@ -26,7 +25,6 @@ show status like "Qcache_queries_in_cache"; 
Variable_name	Value

Qcache_queries_in_cache	0

drop table t1;

commit;

create table t1 (a int not null) engine=bdb;

create table t2 (a int not null) engine=bdb;

create table t3 (a int not null) engine=bdb;

mysql-test/t/bdb_cache.test

+1 −3
Original line number Diff line number Diff line
@@ -14,15 +14,13 @@ insert into t1 values (1),(2),(3); 
select * from t1;

show status like "Qcache_queries_in_cache";

drop table t1;

commit;

set autocommit=1;

begin;

create table t1 (a int not null) engine=bdb;

begin;

insert into t1 values (1),(2),(3);

select * from t1;

show status like "Qcache_queries_in_cache";

drop table t1;

commit;

create table t1 (a int not null) engine=bdb;

create table t2 (a int not null) engine=bdb;

create table t3 (a int not null) engine=bdb;

ndb/src/common/mgmcommon/ConfigRetriever.cpp

+3 −1
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ ConfigRetriever::getConfig(NdbMgmHandle m_handle){ 
    return 0;

  }



  ndb_mgm_disconnect(m_handle);



  return conf;

}

ndb/test/ndbapi/testBlobs.cpp

+3 −2
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ calcBval(const Bcol& b, Bval& v, bool keepsize) 
{

  if (b.m_nullable && urandom(10) == 0) {

    v.m_len = 0;

    delete v.m_val;

    delete [] v.m_val;

    v.m_val = 0;

    v.m_buf = new char [1];

  } else {
@@ -375,7 +375,7 @@ calcBval(const Bcol& b, Bval& v, bool keepsize) 
      v.m_len = urandom(b.m_inline);

    else

      v.m_len = urandom(b.m_inline + g_opt.m_parts * b.m_partsize + 1);

    delete v.m_val;

    delete [] v.m_val;

    v.m_val = new char [v.m_len + 1];

    for (unsigned i = 0; i < v.m_len; i++)

      v.m_val[i] = 'a' + urandom(25);
@@ -1445,6 +1445,7 @@ testperf() 
  if (! testcase('p'))

    return 0;

  DBG("=== perf test ===");

  g_bh1 = g_bh2 = 0;

  g_ndb = new Ndb(g_ncc, "TEST_DB");

  CHK(g_ndb->init() == 0);

  CHK(g_ndb->waitUntilReady() == 0);

sql/sql_select.cc

+6 −5
Original line number Diff line number Diff line
@@ -11644,9 +11644,9 @@ store_record_in_cache(JOIN_CACHE *cache) 
	     end > str && end[-1] == ' ' ;

	     end--) ;

	length=(uint) (end-str);

	memcpy(pos+sizeof(uint), str, length);

	*((uint *) pos)= length;

	pos+= length+sizeof(uint);

	memcpy(pos+sizeof(length), str, length);

	memcpy_fixed(pos, &length, sizeof(length));

	pos+= length+sizeof(length);

      }

      else

      {
@@ -11709,9 +11709,10 @@ read_cached_record(JOIN_TAB *tab) 
    {

      if (copy->strip)

      {

	memcpy(copy->str, pos+sizeof(uint), length= *((uint *) pos));

        memcpy_fixed(&length, pos, sizeof(length));

	memcpy(copy->str, pos+sizeof(length), length);

	memset(copy->str+length, ' ', copy->length-length);

	pos+= sizeof(uint)+length;

	pos+= sizeof(length)+length;

      }

      else

      {