diff options
| author | unknown <pekka@mysql.com> | 2006-02-03 15:23:58 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2006-02-03 15:23:58 +0100 |
| commit | b301e658839f6d5e8eaced201a4ca17f100a569d (patch) | |
| tree | 8bed0c47b6a784036021080456d5c661c44ce1d9 | |
| parent | 1e686ae7702d297cc9fd261c42864653f4fdd7b3 (diff) | |
| download | mariadb-git-b301e658839f6d5e8eaced201a4ca17f100a569d.tar.gz | |
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
| -rw-r--r-- | mysql-test/r/ndb_blob.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/ndb_blob.test | 6 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbBlob.cpp | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_blob.result b/mysql-test/r/ndb_blob.result index 6f25ec95c80..bcf867a4edd 100644 --- a/mysql-test/r/ndb_blob.result +++ b/mysql-test/r/ndb_blob.result @@ -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 ( diff --git a/mysql-test/t/ndb_blob.test b/mysql-test/t/ndb_blob.test index a12ebee2f0d..f80b7f71281 100644 --- a/mysql-test/t/ndb_blob.test +++ b/mysql-test/t/ndb_blob.test @@ -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 -- diff --git a/ndb/src/ndbapi/NdbBlob.cpp b/ndb/src/ndbapi/NdbBlob.cpp index c5692d79e83..416e983ec14 100644 --- a/ndb/src/ndbapi/NdbBlob.cpp +++ b/ndb/src/ndbapi/NdbBlob.cpp @@ -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; |