From 2eb5ae4c3b7ff8923373d49db9eacaa0f5959c7b Mon Sep 17 00:00:00 2001
From: unknown <pekka@mysql.com>
Date: Wed, 22 Dec 2004 13:38:15 +0100
Subject: [PATCH] ndb: bug#7340 fix

mysql-test/r/ndb_blob.result:
  bug#7340 fix
mysql-test/t/ndb_blob.test:
  bug#7340 fix
ndb/src/ndbapi/NdbConnection.cpp:
  bug#7340 fix
ndb/src/ndbapi/NdbOperationDefine.cpp:
  bug#7340 fix
---
 mysql-test/r/ndb_blob.result          | 18 ++++++++++++++++++
 mysql-test/t/ndb_blob.test            | 14 ++++++++++++++
 ndb/src/ndbapi/NdbConnection.cpp      |  7 +++----
 ndb/src/ndbapi/NdbOperationDefine.cpp |  4 +++-
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/mysql-test/r/ndb_blob.result b/mysql-test/r/ndb_blob.result
index 156c2d570a4..6f25ec95c80 100644
--- a/mysql-test/r/ndb_blob.result
+++ b/mysql-test/r/ndb_blob.result
@@ -467,3 +467,21 @@ a	b
 1	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 2	BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 drop table t1;
+create table t1 (
+id int(11) unsigned primary key NOT NULL auto_increment,
+msg text NOT NULL
+) engine=ndbcluster default charset=utf8;
+insert into t1 (msg) values(
+'Tries to validate (8 byte length + inline bytes) as UTF8 :(
+Fast fix: removed validation for Text.  It is not yet indexable
+so bad data will not crash kernel.
+Proper fix: Set inline bytes to multiple of mbmaxlen and
+validate it (after the 8 byte length).');
+select * from t1;
+id	msg
+1	Tries to validate (8 byte length + inline bytes) as UTF8 :(
+Fast fix: removed validation for Text.  It is not yet indexable
+so bad data will not crash kernel.
+Proper fix: Set inline bytes to multiple of mbmaxlen and
+validate it (after the 8 byte length).
+drop table t1;
diff --git a/mysql-test/t/ndb_blob.test b/mysql-test/t/ndb_blob.test
index 06ecbc66d97..96e38bfb58e 100644
--- a/mysql-test/t/ndb_blob.test
+++ b/mysql-test/t/ndb_blob.test
@@ -389,3 +389,17 @@ set autocommit=1;
 alter table t1 engine=myisam;
 select * from t1 order by a;
 drop table t1;
+
+# -- bug #7340 --
+create table t1 (
+  id int(11) unsigned primary key NOT NULL auto_increment,
+  msg text NOT NULL
+) engine=ndbcluster default charset=utf8;
+insert into t1 (msg) values(
+'Tries to validate (8 byte length + inline bytes) as UTF8 :(
+Fast fix: removed validation for Text.  It is not yet indexable
+so bad data will not crash kernel.
+Proper fix: Set inline bytes to multiple of mbmaxlen and
+validate it (after the 8 byte length).');
+select * from t1;
+drop table t1;
diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp
index f4bb000300a..83715dbfca0 100644
--- a/ndb/src/ndbapi/NdbConnection.cpp
+++ b/ndb/src/ndbapi/NdbConnection.cpp
@@ -361,11 +361,10 @@ NdbConnection::execute(ExecType aTypeOfExec,
 
     if (executeNoBlobs(tExecType, abortOption, forceSend) == -1)
         ret = -1;
-#ifndef VM_TRACE
-    // can happen in complex abort cases
-    theFirstOpInList = theLastOpInList = NULL;
-#else
+#ifdef ndb_api_crash_on_complex_blob_abort
     assert(theFirstOpInList == NULL && theLastOpInList == NULL);
+#else
+    theFirstOpInList = theLastOpInList = NULL;
 #endif
 
     {
diff --git a/ndb/src/ndbapi/NdbOperationDefine.cpp b/ndb/src/ndbapi/NdbOperationDefine.cpp
index 35abb15b00d..c4aaffb3119 100644
--- a/ndb/src/ndbapi/NdbOperationDefine.cpp
+++ b/ndb/src/ndbapi/NdbOperationDefine.cpp
@@ -528,7 +528,9 @@ NdbOperation::setValue( const NdbColumnImpl* tAttrInfo,
   CHARSET_INFO* cs = tAttrInfo->m_cs;
   // invalid data can crash kernel
   if (cs != NULL &&
-      (*cs->cset->well_formed_len)(cs,
+      // fast fix bug#7340
+      tAttrInfo->m_type != NdbDictionary::Column::Text &&
+     (*cs->cset->well_formed_len)(cs,
                                    aValue,
                                    aValue + sizeInBytes,
                                    sizeInBytes) != sizeInBytes) {