bk commit into 5.1 tree (jani:1.2406)

[jani]

Below is the list of changes that have just been committed into a local
5.1 repository of jamppa. When jamppa 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@stripped, 2007-01-25 12:28:00+01:00, jani@stripped +2 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
  into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
  MERGE: 1.2390.7.5

  mysql-test/t/myisam.test@stripped, 2007-01-25 12:27:54+01:00, jani@stripped +0 -0
    Auto merged
    MERGE: 1.73.2.1

  mysql-test/t/ndb_basic.test@stripped, 2007-01-25 12:27:54+01:00, jani@stripped +0 -0
    Auto merged
    MERGE: 1.47.2.1

# 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:	jani
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.1-marvel/RESYNC

--- 1.49/mysql-test/t/ndb_basic.test	2007-01-25 12:28:06 +01:00
+++ 1.50/mysql-test/t/ndb_basic.test	2007-01-25 12:28:06 +01:00
@@ -722,7 +722,24 @@
 --error 1
 --exec $MY_PERROR --ndb 1186 2>&1
 
+#
+# Bug #25746 - VARCHAR UTF8 PK issue
+# - prior to bugfix 4209, illegal length parameter would be
+# returned in SELECT *
+
+CREATE TABLE t1 (
+a VARBINARY(40) NOT NULL,
+b VARCHAR (256) CHARACTER SET UTF8 NOT NULL,
+c VARCHAR(256) CHARACTER SET UTF8 NOT NULL,
+PRIMARY KEY (b,c))  ENGINE=ndbcluster;
+INSERT INTO t1 VALUES
+("a","ab","abc"),("b","abc","abcd"),("c","abc","ab"),("d","ab","ab"),("e","abc","abc");
+SELECT * FROM t1 ORDER BY a;
+DROP TABLE t1;
+
+# End of 5.0 tests
 --echo End of 5.0 tests
+
 
 #
 # Bug #18483 Cannot create table with FK constraint

--- 1.80/mysql-test/t/myisam.test	2007-01-25 12:28:06 +01:00
+++ 1.81/mysql-test/t/myisam.test	2007-01-25 12:28:06 +01:00
@@ -453,9 +453,9 @@
 insert into t1 (b) values ('a'),('b'),('c');
 select concat(b,'.') from t1;
 update t1 set b='b ' where a=2;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 update t1 set b='b  ' where a > 1;
---error 1062
+--error ER_DUP_ENTRY_WITH_KEY_NAME
 insert into t1 (b) values ('b');
 select * from t1;
 delete from t1 where b='b';