Commit b301e658 authored by unknown's avatar unknown

ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ]


mysql-test/r/ndb_blob.result:
  replace+tinyblob back-patch from 5.0
mysql-test/t/ndb_blob.test:
  replace+tinyblob back-patch from 5.0
ndb/src/ndbapi/NdbBlob.cpp:
  replace+tinyblob back-patch from 5.0
parent 1e686ae7
...@@ -428,6 +428,13 @@ delete from t1; ...@@ -428,6 +428,13 @@ delete from t1;
select * from t1; select * from t1;
a b a b
commit; commit;
replace t1 set a=2, b='y';
select * from t1;
a b
2 y
delete from t1;
select * from t1;
a b
drop table t1; drop table t1;
set autocommit=0; set autocommit=0;
create table t1 ( create table t1 (
......
...@@ -338,7 +338,7 @@ select * from t1 order by a; ...@@ -338,7 +338,7 @@ select * from t1 order by a;
drop table t1; drop table t1;
drop database test2; drop database test2;
# -- bug-5252 tinytext crashes plus no-commit result -- # -- bug-5252 tinytext crashes + no-commit result + replace --
set autocommit=0; set autocommit=0;
create table t1 ( create table t1 (
...@@ -352,6 +352,10 @@ select * from t1; ...@@ -352,6 +352,10 @@ select * from t1;
delete from t1; delete from t1;
select * from t1; select * from t1;
commit; commit;
replace t1 set a=2, b='y';
select * from t1;
delete from t1;
select * from t1;
drop table t1; drop table t1;
# -- bug-5013 insert empty string to text -- # -- bug-5013 insert empty string to text --
......
...@@ -959,6 +959,8 @@ int ...@@ -959,6 +959,8 @@ int
NdbBlob::deletePartsUnknown(Uint32 part) NdbBlob::deletePartsUnknown(Uint32 part)
{ {
DBG("deletePartsUnknown [in] part=" << part << " count=all"); DBG("deletePartsUnknown [in] part=" << part << " count=all");
if (thePartSize == 0) // tinyblob
return 0;
static const unsigned maxbat = 256; static const unsigned maxbat = 256;
static const unsigned minbat = 1; static const unsigned minbat = 1;
unsigned bat = minbat; unsigned bat = minbat;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment