Merge mysql.com:/home/jonas/src/mysql-4.1-fix

into mysql.com:/home/jonas/src/mysql-4.1

mysql-test/r/ndb_charset.result

@@ -189,3 +189,13 @@ p	a
 5	aaa
 6	AAA
 drop table t1;
+create table t1 (
+a varchar(10) primary key
+) engine=ndb;
+insert into t1 values ('jonas % ');
+replace into t1 values ('jonas % ');
+replace into t1 values ('jonas % ');
+select * from t1;
+a
+jonas %
+drop table t1;

mysql-test/t/ndb_charset.test

@@ -157,3 +157,13 @@ select * from t1 where a = 'AaA' order by p;
 # 6
 select * from t1 where a = 'AAA' order by p;
 drop table t1;
+
+# bug 
+create table t1 (
+  a varchar(10) primary key
+) engine=ndb;
+insert into t1 values ('jonas % ');
+replace into t1 values ('jonas % ');
+replace into t1 values ('jonas % ');
+select * from t1;
+drop table t1;

ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp

@@ -706,7 +706,10 @@ Dbtup::checkUpdateOfPrimaryKey(Uint32* updateBuffer, Tablerec* const regTabPtr)
   tOutBufIndex = 0;
   tMaxRead = MAX_KEY_SIZE_IN_WORDS;
 
+  bool tmp = tXfrmFlag;
+  tXfrmFlag = false;
   ndbrequire((this->*f)(&keyReadBuffer[0], ahOut, attrDescriptor, attributeOffset));
+  tXfrmFlag = tmp;
   ndbrequire(tOutBufIndex == ahOut->getDataSize());
   if (ahIn.getDataSize() != ahOut->getDataSize()) {
     ljam();