bk commit into 5.0 tree (pekka:1.2030)

[pekka]

Below is the list of changes that have just been committed into a local
5.0 repository of pekka. When pekka does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2030 06/02/03 14:35:29 pekka@stripped +3 -0
  ndb - bugfix: tinyblob + replace => mysqld crash (no bug#)

  ndb/src/ndbapi/NdbBlob.cpp
    1.25 06/02/03 14:33:33 pekka@stripped +2 -0
    do not delete unknown parts of tinyblob

  mysql-test/t/ndb_blob.test
    1.15 06/02/03 14:33:33 pekka@stripped +5 -1
    do not delete unknown parts of tinyblob

  mysql-test/r/ndb_blob.result
    1.16 06/02/03 14:33:33 pekka@stripped +7 -0
    do not delete unknown parts of tinyblob

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my50

--- 1.15/mysql-test/r/ndb_blob.result	2004-12-31 14:30:46 +01:00
+++ 1.16/mysql-test/r/ndb_blob.result	2006-02-03 14:33:33 +01:00
@@ -428,6 +428,13 @@
 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 (

--- 1.14/mysql-test/t/ndb_blob.test	2005-07-28 02:21:44 +02:00
+++ 1.15/mysql-test/t/ndb_blob.test	2006-02-03 14:33:33 +01:00
@@ -338,7 +338,7 @@
 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 @@
 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 --

--- 1.24/ndb/src/ndbapi/NdbBlob.cpp	2005-09-20 10:25:25 +02:00
+++ 1.25/ndb/src/ndbapi/NdbBlob.cpp	2006-02-03 14:33:33 +01:00
@@ -947,6 +947,8 @@
 {
   DBUG_ENTER("NdbBlob::deletePartsUnknown");
   DBUG_PRINT("info", ("part=%u count=all", part));
+  if (thePartSize == 0) // tinyblob
+    DBUG_RETURN(0);
   static const unsigned maxbat = 256;
   static const unsigned minbat = 1;
   unsigned bat = minbat;