ndb - bug#14007 5.0 *** does not automerge into 5.1 ***

mysql-test/r/ndb_charset.result:
  bug#14007 5.0
mysql-test/t/ndb_charset.test:
  bug#14007 5.0
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  bug#14007 5.0
ndb/src/kernel/vm/SimulatedBlock.cpp:
  bug#14007 5.0
ndb/src/kernel/vm/SimulatedBlock.hpp:
  bug#14007 5.0

2 files changed, 25 insertions, 10 deletions

diff --git a/mysql-test/r/ndb_charset.result b/mysql-test/r/ndb_charset.result
index 500b0497890..3763e20e59a 100644
--- a/mysql-test/r/ndb_charset.result
+++ b/mysql-test/r/ndb_charset.result
@@ -306,11 +306,21 @@ count(*)
 drop table t1;
 create table t1 (
 a char(10) primary key
-) engine=ndb;
-insert into t1 values ('jonas % ');
-replace into t1 values ('jonas % ');
-replace into t1 values ('jonas % ');
+) engine=ndbcluster default charset=latin1;
+insert into t1 values ('aaabb');
+select * from t1;
+a
+aaabb
+replace into t1 set a = 'AAABB';
+select * from t1;
+a
+AAABB
+replace into t1 set a = 'aAaBb';
+select * from t1;
+a
+aAaBb
+replace into t1 set a = 'aaabb';
 select * from t1;
 a
-jonas %
+aaabb
 drop table t1;
diff --git a/mysql-test/t/ndb_charset.test b/mysql-test/t/ndb_charset.test
index fb43e1831f3..5941e5750db 100644
--- a/mysql-test/t/ndb_charset.test
+++ b/mysql-test/t/ndb_charset.test
@@ -237,13 +237,18 @@ drop table t1;
 #select a,b,length(a),length(b) from t1 where a='c' and b='c';
 #drop table t1;
 
-# bug 
+# bug#14007
 create table t1 (
   a char(10) primary key
-) engine=ndb;
-insert into t1 values ('jonas % ');
-replace into t1 values ('jonas % ');
-replace into t1 values ('jonas % ');
+) engine=ndbcluster default charset=latin1;
+
+insert into t1 values ('aaabb');
+select * from t1;
+replace into t1 set a = 'AAABB';
+select * from t1;
+replace into t1 set a = 'aAaBb';
+select * from t1;
+replace into t1 set a = 'aaabb';
 select * from t1;
 drop table t1;