summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mysql.com>2009-02-10 19:49:36 +0100
committerSergei Golubchik <serg@mysql.com>2009-02-10 19:49:36 +0100
commit2637dda66845868fe996e60e54996acf03f6c537 (patch)
treeb09bcfc0e694303e26e524f6e9985b42de7fe1a3 /mysql-test
parentd5c0d257923221458aec7b01dbf538dbb9aaea4b (diff)
parent9653feb1600c84fc5e51fe102761c93b7f83de0f (diff)
downloadmariadb-git-2637dda66845868fe996e60e54996acf03f6c537.tar.gz
merged
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ctype_utf8.result2
-rw-r--r--mysql-test/t/ctype_utf8.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ctype_utf8.result b/mysql-test/r/ctype_utf8.result
index 6f4ae965ca0..4cfd06149f1 100644
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@@ -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' );
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index f0c769251cf..bb64319f1e4 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -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)));
#