diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 18:14:50 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-01 18:14:50 -0600 |
| commit | 41ac5d83b228e29345882b28517a0ba6933ecafb (patch) | |
| tree | 388d81a01a0bea738fcd0d47b69dca3795b38441 /mysql-test/r/innodb_mysql.result | |
| parent | 25723542a1ffcd3365b51a48bbab0e238306ab2a (diff) | |
| parent | 1b04b4b11382f63b5b276d0f5d046b29adca72d0 (diff) | |
| download | mariadb-git-41ac5d83b228e29345882b28517a0ba6933ecafb.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
sql/ha_federated.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/t/innodb_mysql.test:
Manual merge
Diffstat (limited to 'mysql-test/r/innodb_mysql.result')
| -rw-r--r-- | mysql-test/r/innodb_mysql.result | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result index 7f60d785091..63e25b7aa1e 100644 --- a/mysql-test/r/innodb_mysql.result +++ b/mysql-test/r/innodb_mysql.result @@ -418,7 +418,7 @@ DROP TABLE t1,t2; create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb character set utf8 collate utf8_general_ci; Warnings: -Warning 1071 Specified key was too long; max key length is 765 bytes +Warning 1071 Specified key was too long; max key length is 767 bytes insert into t1 values('aaa'); drop table t1; CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c FLOAT, KEY b(b)) ENGINE = INNODB; @@ -1035,4 +1035,16 @@ CALL p1(); CALL p1(); DROP PROCEDURE p1; DROP TABLE t1; +create table t1(a text) engine=innodb default charset=utf8; +insert into t1 values('aaa'); +alter table t1 add index(a(1024)); +Warnings: +Warning 1071 Specified key was too long; max key length is 767 bytes +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` text, + KEY `a` (`a`(255)) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 +drop table t1; End of 5.0 tests |