Commit c696582d authored by pekka@mysql.com's avatar pekka@mysql.com
Browse files

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

parent 736faf47

mysql-test/r/ndb_blob.result

+7 −0
Original line number Diff line number Diff line
@@ -428,6 +428,13 @@ delete from t1; 
select * from t1;

a	b

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;

set autocommit=0;

create table t1 (

mysql-test/t/ndb_blob.test

+5 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ select * from t1 order by a; 
drop table t1;

drop database test2;



# -- bug-5252 tinytext crashes plus no-commit result --

# -- bug-5252 tinytext crashes + no-commit result + replace --



set autocommit=0;

create table t1 (
@@ -352,6 +352,10 @@ select * from t1; 
delete from t1;

select * from t1;

commit;

replace t1 set a=2, b='y';

select * from t1;

delete from t1;

select * from t1;

drop table t1;



# -- bug-5013 insert empty string to text --

ndb/src/ndbapi/NdbBlob.cpp

+2 −0
Original line number Diff line number Diff line
@@ -959,6 +959,8 @@ int 
NdbBlob::deletePartsUnknown(Uint32 part)

{

  DBG("deletePartsUnknown [in] part=" << part << " count=all");

  if (thePartSize == 0) // tinyblob

    return 0;

  static const unsigned maxbat = 256;

  static const unsigned minbat = 1;

  unsigned bat = minbat;