bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2726)

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/ based on revid:guilhem@stripped

 2726 Guilhem Bichot	2009-01-26
      In ctype_utf8.test, use a column large enough to provoke a failure in Maria too, not only in MyISAM
      (this is to ease ./mtr --mysqld=--default-storage-engine=maria)
modified:
  mysql-test/r/ctype_utf8.result
  mysql-test/t/ctype_utf8.test

=== modified file 'mysql-test/r/ctype_utf8.result'
--- a/mysql-test/r/ctype_utf8.result	2008-11-21 13:32:45 +0000
+++ b/mysql-test/r/ctype_utf8.result	2009-01-26 21:19:13 +0000
@@ -240,7 +240,7 @@ select hex(s1) from t1;
 hex(s1)
 41
 drop table t1;
-create table t1 (a text character set utf8, primary key(a(360)));
+create table t1 (a text character set utf8, primary key(a(371)));
 ERROR 42000: Specified key was too long; max key length is 1000 bytes
 CREATE TABLE t1 ( a varchar(10) ) CHARACTER SET utf8;
 INSERT INTO t1 VALUES ( 'test' );

=== modified file 'mysql-test/t/ctype_utf8.test'
--- a/mysql-test/t/ctype_utf8.test	2008-11-21 13:32:45 +0000
+++ b/mysql-test/t/ctype_utf8.test	2009-01-26 21:19:13 +0000
@@ -164,7 +164,7 @@ drop table t1;
 # UTF8 breaks primary keys for cols > 333 characters
 #
 --error 1071
-create table t1 (a text character set utf8, primary key(a(360)));
+create table t1 (a text character set utf8, primary key(a(371)));
 
 
 #