bk commit into 5.0 tree (jonas:1.1987)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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.1987 05/12/14 11:34:08 jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

  ndb/src/kernel/vm/SimulatedBlock.cpp
    1.23 05/12/14 11:34:05 jonas@stripped +6 -10
    merge

  sql/ha_ndbcluster.cc
    1.223 05/12/14 11:30:21 jonas@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.89 05/12/14 11:30:21 jonas@stripped +0 -0
    Auto merged

  mysql-test/t/ndb_basic.test
    1.33 05/12/14 11:30:21 jonas@stripped +0 -0
    Auto merged

  mysql-test/r/ndb_basic.result
    1.32 05/12/14 11:30:21 jonas@stripped +0 -0
    Auto merged

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.0-push/RESYNC

--- 1.31/mysql-test/r/ndb_basic.result	2005-11-25 16:53:49 +01:00
+++ 1.32/mysql-test/r/ndb_basic.result	2005-12-14 11:30:21 +01:00
@@ -677,3 +677,19 @@
 a
 2
 drop table atablewithareallylongandirritatingname;
+create table t1 (f1 varchar(50), f2 text,f3 int, primary key(f1)) engine=NDB;
+insert into t1 (f1,f2,f3)VALUES("111111","aaaaaa",1);
+insert into t1 (f1,f2,f3)VALUES("222222","bbbbbb",2);
+select * from t1 order by f1;
+f1	f2	f3
+111111	aaaaaa	1
+222222	bbbbbb	2
+select * from t1 order by f2;
+f1	f2	f3
+111111	aaaaaa	1
+222222	bbbbbb	2
+select * from t1 order by f3;
+f1	f2	f3
+111111	aaaaaa	1
+222222	bbbbbb	2
+drop table t1;

--- 1.32/mysql-test/t/ndb_basic.test	2005-11-25 11:57:07 +01:00
+++ 1.33/mysql-test/t/ndb_basic.test	2005-12-14 11:30:21 +01:00
@@ -623,3 +623,14 @@
 insert into atablewithareallylongandirritatingname values (2);
 select * from atablewithareallylongandirritatingname;
 drop table atablewithareallylongandirritatingname;
+
+#
+# Bug#15682
+#
+create table t1 (f1 varchar(50), f2 text,f3 int, primary key(f1)) engine=NDB;
+insert into t1 (f1,f2,f3)VALUES("111111","aaaaaa",1);
+insert into t1 (f1,f2,f3)VALUES("222222","bbbbbb",2);
+select * from t1 order by f1;
+select * from t1 order by f2;
+select * from t1 order by f3;
+drop table t1;

--- 1.88/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-12-13 11:58:43 +01:00
+++ 1.89/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-12-14 11:30:21 +01:00
@@ -2313,7 +2313,10 @@
   {
     keyPartLenPtr = keyPartLen;
     dstPos = xfrm_key(tabPtrI, src, dst, sizeof(Tmp) >> 2, keyPartLenPtr);
-    ndbrequire(dstPos);
+    if (unlikely(dstPos == 0))
+    {
+      goto error;
+    }
   } 
   else 
   {
@@ -2334,6 +2337,10 @@
     dstHash[1] = tmp[1];
   }
   return true;  // success
+
+error:
+  terrorCode = ZINVALID_KEY;
+  return false;
 }
 
 /*
@@ -2941,7 +2948,15 @@
   UintR tnoOfStandby;
   UintR tnodeinfo;
 
+  terrorCode = 0;
+
   hash(signal); /* NOW IT IS TIME TO CALCULATE THE HASH VALUE*/
+  
+  if (unlikely(terrorCode))
+  {
+    releaseAtErrorLab(signal);
+    return;
+  }
 
   CacheRecord * const regCachePtr = cachePtr.p;
   TcConnectRecord * const regTcPtr = tcConnectptr.p;

--- 1.22/ndb/src/kernel/vm/SimulatedBlock.cpp	2005-11-16 13:24:59 +01:00
+++ 1.23/ndb/src/kernel/vm/SimulatedBlock.cpp	2005-12-14 11:34:05 +01:00
@@ -1872,6 +1872,8 @@
       xfrm_attr(keyAttr.attributeDescriptor, keyAttr.charsetInfo,
                 src, srcPos, dst, dstPos, dstSize);
     keyPartLen[i++] = dstWords;
+    if (unlikely(dstWords == 0))
+      return 0;
   }
 
   return dstPos;
@@ -1900,7 +1902,8 @@
     Uint32 typeId = AttributeDescriptor::getType(attrDesc);
     Uint32 lb, len;
     bool ok = NdbSqlUtil::get_var_length(typeId, srcPtr, srcBytes, lb, len);
-    ndbrequire(ok);
+    if (unlikely(!ok))
+      return 0;
     Uint32 xmul = cs->strxfrm_multiply;
     if (xmul == 0)
       xmul = 1;
@@ -1911,7 +1914,8 @@
     Uint32 dstLen = xmul * (srcBytes - lb);
     ndbrequire(dstLen <= ((dstSize - dstPos) << 2));
     int n = NdbSqlUtil::strnxfrm_bug7284(cs, dstPtr, dstLen, srcPtr + lb, len);
-    ndbrequire(n != -1);
+    if (unlikely(n == -1))
+      return 0;
     while ((n & 3) != 0) 
     {
       dstPtr[n++] = 0;

--- 1.222/sql/ha_ndbcluster.cc	2005-11-25 11:57:07 +01:00
+++ 1.223/sql/ha_ndbcluster.cc	2005-12-14 11:30:21 +01:00
@@ -2812,8 +2812,26 @@
         }      
         *buff++= 0;
       }
-      memcpy(buff, record + key_part->offset, key_part->length);
-      buff += key_part->length;
+
+      size_t len = key_part->length;
+      const byte * ptr = record + key_part->offset;
+      Field *field = key_part->field;
+      if ((field->type() ==  MYSQL_TYPE_VARCHAR) &&
+	  ((Field_varstring*)field)->length_bytes == 1)
+      {
+	/** 
+	 * Keys always use 2 bytes length
+	 */
+	buff[0] = ptr[0];
+	buff[1] = 0;
+	memcpy(buff+2, ptr + 1, len);	
+	len += 2;
+      }
+      else
+      {
+	memcpy(buff, ptr, len);
+      }
+      buff += len;
     }
   } 
   else