bzr commit into mysql-6.0-bugteam branch (horst:3021) Bug#41299

[Horst Hunger]

#At file:///work/bzr/mysql-6.0-41299/

 3021 Horst Hunger	2009-02-05
      Proposed fix for bug#41299. Due to deleting the lines 757 to 788 in the test, the stats variables show lower values. The result file needs to be updated.
modified:
  mysql-test/r/innodb.result
  mysql-test/t/disabled.def

=== modified file 'mysql-test/r/innodb.result'
--- a/mysql-test/r/innodb.result	2009-01-26 16:32:29 +0000
+++ b/mysql-test/r/innodb.result	2009-02-05 16:10:40 +0000
@@ -1731,10 +1731,10 @@ Variable_name	Value
 Innodb_page_size	16384
 show status like "Innodb_rows_deleted";
 Variable_name	Value
-Innodb_rows_deleted	71
+Innodb_rows_deleted	70
 show status like "Innodb_rows_inserted";
 Variable_name	Value
-Innodb_rows_inserted	1084
+Innodb_rows_inserted	1082
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	885
@@ -2694,6 +2694,11 @@ b varchar(255) character set utf8,
 c varchar(255) character set utf8,
 d varchar(255) character set utf8,
 key (a,b,c,d)) engine=innodb;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 767 bytes
 drop table t1;
 create table t1 (a varchar(255) character set utf8,
 b varchar(255) character set utf8,
@@ -2701,7 +2706,7 @@ c varchar(255) character set utf8,
 d varchar(255) character set utf8,
 e varchar(255) character set utf8,
 key (a,b,c,d,e)) engine=innodb;
-ERROR 42000: Specified key was too long; max key length is 3072 bytes
+ERROR 42000: Specified key was too long; max key length is 3500 bytes
 create table t1 (s1 varbinary(2),primary key (s1)) engine=innodb;
 create table t2 (s1 binary(2),primary key (s1)) engine=innodb;
 create table t3 (s1 varchar(2) binary,primary key (s1)) engine=innodb;
@@ -3087,6 +3092,8 @@ KEY idx_t2_b_c (b,c(200)),
 CONSTRAINT t_fk FOREIGN KEY (a) REFERENCES t1 (a) 
 ON DELETE CASCADE
 ) ENGINE=INNODB DEFAULT CHARSET=UTF8;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1, 'bar', 'vbar');
 INSERT INTO t2 VALUES (1, 'BAR2', 'VBAR');

=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2009-02-03 09:16:53 +0000
+++ b/mysql-test/t/disabled.def	2009-02-05 16:10:40 +0000
@@ -28,8 +28,8 @@ slow_query_log_func                   : 
 thread_cache_size_func      : Bug#40574 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
 innodb_max_dirty_pages_pct_func       : BUG#41018 BUG#39382 2008-12-02 sven test fails often. some failures fill up the disk, causing subsequent failures in many other tests
 log_output_basic     : Bug #40988       log_output_basic.test succeeded though syntactically false.
-innodb               : Bug #41056    Innodb.test shows some difference to its result file.
-innodb                            : Bug#41299 2008-12-08 alik
+#innodb               : Bug #41056    Innodb.test shows some difference to its result file.
+#innodb                            : Bug#41299 2008-12-08 alik
 federated_transactions            : Bug#29523 Transactions do not work
 ;backup_no_engine                  : Bug#36021 2008-04-13 rsomla server crashes when openning table with unknown storage engine
 ;backup_triggers_and_events       : Bug#37762 2008-07-01 rafal Test fails on remove_file for unknown reasons