Attachment 104442 Details for Bug 144621 – file.diff

[patch] file.diff

file.diff (text/plain), 5.09 KB, created by Terranus on 2010-03-10 13:30:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Terranus

Created: 2010-03-10 13:30:07 UTC

Size: 5.09 KB

patch

obsolete

>--- /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/r/ctype_utf8.result.bak	2010-01-15 13:13:39.000000000 +0300
>+++ /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/r/ctype_utf8.result	2010-03-10 15:24:57.000000000 +0300
>@@ -240,8 +240,8 @@
> hex(s1)
> 41
> drop table t1;
>-create table t1 (a text character set utf8, primary key(a(360)));
>-ERROR 42000: Specified key was too long; max key length is 1000 bytes
>+create table t1 (a text character set utf8, primary key(a(3600)));
>+ERROR 42000: Specified key was too long; max key length is 3072 bytes
> CREATE TABLE t1 ( a varchar(10) ) CHARACTER SET utf8;
> INSERT INTO t1 VALUES ( 'test' );
> SELECT a.a, b.a FROM t1 a, t1 b WHERE a.a = b.a;
>--- /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/t/ctype_utf8.test.bak	2010-01-15 13:13:38.000000000 +0300
>+++ /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/t/ctype_utf8.test	2010-03-10 15:23:44.000000000 +0300
>@@ -164,7 +164,7 @@
> # 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(3600)));
> 
> 
> #
>--- /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/r/myisam.result.bak	2010-01-15 13:13:39.000000000 +0300
>+++ /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/r/myisam.result	2010-03-09 16:39:12.000000000 +0300
>@@ -322,11 +322,11 @@
> Table	Op	Msg_type	Msg_text
> test.t1	check	status	OK
> drop table t1;
>-CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), KEY t1 (a, b, c, d, e));
>-ERROR 42000: Specified key was too long; max key length is 1000 bytes
>-CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255));
>+CREATE TABLE t1 (a varchar(511), b varchar(511), c varchar(1023), d varchar(1023), e varchar(255), KEY t1 (a, b, c, d, e));
>+ERROR 42000: Specified key was too long; max key length is 3072 bytes
>+CREATE TABLE t1 (a varchar(511), b varchar(511), c varchar(1023), d varchar(1023), e varchar(255));
> ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e);
>-ERROR 42000: Specified key was too long; max key length is 1000 bytes
>+ERROR 42000: Specified key was too long; max key length is 3072 bytes
> DROP TABLE t1;
> CREATE TABLE t1 (a int not null, b int, c int, key(b), key(c), key(a,b), key(c,a));
> INSERT into t1 values (0, null, 0), (0, null, 1), (0, null, 2), (0, null,3), (1,1,4);
>@@ -1668,7 +1668,7 @@
> drop table t1;
> create table t1 (v varchar(65530), key(v));
> Warnings:
>-Warning	1071	Specified key was too long; max key length is 1000 bytes
>+Warning	1071	Specified key was too long; max key length is 3072 bytes
> drop table if exists t1;
> create table t1 (v varchar(65536));
> Warnings:
>--- /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/t/myisam.test.bak	2010-01-15 13:13:38.000000000 +0300
>+++ /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/t/myisam.test	2010-03-09 16:37:12.000000000 +0300
>@@ -337,8 +337,8 @@
> #
> 
> --error 1071
>-CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255), KEY t1 (a, b, c, d, e));
>-CREATE TABLE t1 (a varchar(255), b varchar(255), c varchar(255), d varchar(255), e varchar(255));
>+CREATE TABLE t1 (a varchar(511), b varchar(511), c varchar(1023), d varchar(1023), e varchar(255), KEY t1 (a, b, c, d, e));
>+CREATE TABLE t1 (a varchar(511), b varchar(511), c varchar(1023), d varchar(1023), e varchar(255));
> --error 1071
> ALTER TABLE t1 ADD INDEX t1 (a, b, c, d, e);
> DROP TABLE t1;
>--- /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/r/type_blob.result.bak	2010-01-15 13:13:40.000000000 +0300
>+++ /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/r/type_blob.result	2010-03-10 10:18:50.000000000 +0300
>@@ -356,16 +356,16 @@
> a	1
> hello	1
> drop table t1;
>-create table t1 (a text, unique (a(2100)));
>-ERROR 42000: Specified key was too long; max key length is 1000 bytes
>-create table t1 (a text, key (a(2100)));
>+create table t1 (a text, unique (a(3100)));
>+ERROR 42000: Specified key was too long; max key length is 3072 bytes
>+create table t1 (a text, key (a(3100)));
> Warnings:
>-Warning	1071	Specified key was too long; max key length is 1000 bytes
>+Warning	1071	Specified key was too long; max key length is 3072 bytes
> show create table t1;
> Table	Create Table
> t1	CREATE TABLE `t1` (
>   `a` text,
>-  KEY `a` (`a`(1000))
>+  KEY `a` (`a`(3072))
> ) ENGINE=MyISAM DEFAULT CHARSET=latin1
> drop table t1;
> CREATE TABLE t1 (
>--- /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/t/type_blob.test.bak	2010-01-15 13:13:38.000000000 +0300
>+++ /usr/ports/databases/mysql50-server/work/mysql-5.0.90/mysql-test/t/type_blob.test	2010-03-10 10:18:12.000000000 +0300
>@@ -132,8 +132,8 @@
> drop table t1;
> 
> -- error 1071
>-create table t1 (a text, unique (a(2100))); # should give an error
>-create table t1 (a text, key (a(2100)));    # key is auto-truncated
>+create table t1 (a text, unique (a(3100))); # should give an error
>+create table t1 (a text, key (a(3100)));    # key is auto-truncated
> show create table t1;
> drop table t1;

Actions: View | Diff

Attachments on bug 144621: 104442