database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merged

Browse Source 
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
This commit is contained in:
unknown
2005-06-16 14:35:15 +02:00
parent f1f1d39a29 c23524c714
commit 536a1cd14b
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/bdb_cache.result
View File

@@ -12,10 +12,9 @@ show status like "Qcache_queries_in_cache";
Variable_name Value Variable_name Value
Qcache_queries_in_cache 0 Qcache_queries_in_cache 0
drop table t1; drop table t1;
commit;
set autocommit=1; set autocommit=1;
begin;
create table t1 (a int not null) engine=bdb; create table t1 (a int not null) engine=bdb;
begin;
insert into t1 values (1),(2),(3); insert into t1 values (1),(2),(3);
select * from t1; select * from t1;
a a
@@ -26,7 +25,6 @@ show status like "Qcache_queries_in_cache";
Variable_name Value Variable_name Value
Qcache_queries_in_cache 0 Qcache_queries_in_cache 0
drop table t1; drop table t1;
commit;
create table t1 (a int not null) engine=bdb; create table t1 (a int not null) engine=bdb;
create table t2 (a int not null) engine=bdb; create table t2 (a int not null) engine=bdb;
create table t3 (a int not null) engine=bdb; create table t3 (a int not null) engine=bdb;

4
mysql-test/t/bdb_cache.test
View File

@@ -14,15 +14,13 @@ insert into t1 values (1),(2),(3);
select * from t1; select * from t1;
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
drop table t1; drop table t1;
commit;
set autocommit=1; set autocommit=1;
begin;
create table t1 (a int not null) engine=bdb; create table t1 (a int not null) engine=bdb;
begin;
insert into t1 values (1),(2),(3); insert into t1 values (1),(2),(3);
select * from t1; select * from t1;
show status like "Qcache_queries_in_cache"; show status like "Qcache_queries_in_cache";
drop table t1; drop table t1;
commit;
create table t1 (a int not null) engine=bdb; create table t1 (a int not null) engine=bdb;
create table t2 (a int not null) engine=bdb; create table t2 (a int not null) engine=bdb;
create table t3 (a int not null) engine=bdb; create table t3 (a int not null) engine=bdb;

4
ndb/src/common/mgmcommon/ConfigRetriever.cpp
View File

@@ -138,7 +138,9 @@ ConfigRetriever::getConfig(NdbMgmHandle m_handle){
setError(CR_ERROR, ndb_mgm_get_latest_error_desc(m_handle)); setError(CR_ERROR, ndb_mgm_get_latest_error_desc(m_handle));
return 0; return 0;
} }
ndb_mgm_disconnect(m_handle);
return conf; return conf;
} }

5
ndb/test/ndbapi/testBlobs.cpp
View File

@@ -365,7 +365,7 @@ calcBval(const Bcol& b, Bval& v, bool keepsize)
{ {
if (b.m_nullable && urandom(10) == 0) { if (b.m_nullable && urandom(10) == 0) {
v.m_len = 0; v.m_len = 0;
delete v.m_val; delete [] v.m_val;
v.m_val = 0; v.m_val = 0;
v.m_buf = new char [1]; v.m_buf = new char [1];
} else { } else {
@@ -375,7 +375,7 @@ calcBval(const Bcol& b, Bval& v, bool keepsize)
v.m_len = urandom(b.m_inline); v.m_len = urandom(b.m_inline);
else else
v.m_len = urandom(b.m_inline + g_opt.m_parts * b.m_partsize + 1); 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]; v.m_val = new char [v.m_len + 1];
for (unsigned i = 0; i < v.m_len; i++) for (unsigned i = 0; i < v.m_len; i++)
v.m_val[i] = 'a' + urandom(25); v.m_val[i] = 'a' + urandom(25);
@@ -1445,6 +1445,7 @@ testperf()
if (! testcase('p')) if (! testcase('p'))
return 0; return 0;
DBG("=== perf test ==="); DBG("=== perf test ===");
g_bh1 = g_bh2 = 0;
g_ndb = new Ndb(g_ncc, "TEST_DB"); g_ndb = new Ndb(g_ncc, "TEST_DB");
CHK(g_ndb->init() == 0); CHK(g_ndb->init() == 0);
CHK(g_ndb->waitUntilReady() == 0); CHK(g_ndb->waitUntilReady() == 0);

11
sql/sql_select.cc
View File

@@ -11644,9 +11644,9 @@ store_record_in_cache(JOIN_CACHE *cache)
end > str && end[-1] == ' ' ; end > str && end[-1] == ' ' ;
end--) ; end--) ;
length=(uint) (end-str); length=(uint) (end-str);
memcpy(pos+sizeof(uint), str, length); memcpy(pos+sizeof(length), str, length);
*((uint *) pos)= length; memcpy_fixed(pos, &length, sizeof(length));
pos+= length+sizeof(uint); pos+= length+sizeof(length);
} }
else else
{ {
@@ -11709,9 +11709,10 @@ read_cached_record(JOIN_TAB *tab)
{ {
if (copy->strip) 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); memset(copy->str+length, ' ', copy->length-length);
pos+= sizeof(uint)+length; pos+= sizeof(length)+length;
} }
else else
{ {