bzr push into mysql-5.1 branch (marko.makela:3680 to 3681) Bug#13654923

[marko.makela]

 3681 Marko Mäkelä	2012-02-02
      Bug#13654923 BOGUS DEBUG ASSERTION IN INDEX CREATION FOR ZERO-LENGTH RECORD
      
      row_merge_buf_write(): Relax the bogus assertion.

    modified:
      mysql-test/suite/innodb_plugin/r/innodb-index.result
      mysql-test/suite/innodb_plugin/t/innodb-index.test
      storage/innodb_plugin/row/row0merge.c
 3680 Marko Mäkelä	2012-02-02
      Suppress messages about long semaphore waits in innodb_bug34300.test.

    modified:
      mysql-test/suite/innodb/t/innodb_bug34300.test
      mysql-test/suite/innodb_plugin/t/innodb_bug34300.test
=== modified file 'mysql-test/suite/innodb_plugin/r/innodb-index.result'
--- a/mysql-test/suite/innodb_plugin/r/innodb-index.result	revid:[e-mail]-20120202100706-penzu78bhcx1eqom
+++ b/mysql-test/suite/innodb_plugin/r/innodb-index.result	revid:marko.makela@stripped
@@ -114,6 +114,10 @@ t12963823	CREATE TABLE `t12963823` (
   KEY `ndx_o` (`o`(500)),
   KEY `ndx_p` (`p`(500))
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+create table t1(a varchar(2) primary key) engine=innodb;
+insert into t1 values('');
+create index t1a1 on t1(a(1));
+drop table t1;
 set global innodb_file_per_table=0;
 set global innodb_file_format=Antelope;
 create table t1(a int not null, b int, c char(10) not null, d varchar(20)) engine = innodb;

=== modified file 'mysql-test/suite/innodb_plugin/t/innodb-index.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb-index.test	revid:marko.makela@stripped120202100706-penzu78bhcx1eqom
+++ b/mysql-test/suite/innodb_plugin/t/innodb-index.test	revid:marko.makela@strippedom-20120202113832-hhzwa7wb13lb0qja
@@ -119,6 +119,11 @@ show create table t12963823;
 # this file complete before dropping the table.  By then, the purge thread
 # will have delt with the updates above.
 
+# Bug#13654923 BOGUS DEBUG ASSERTION IN INDEX CREATION FOR ZERO-LENGTH RECORD
+create table t1(a varchar(2) primary key) engine=innodb;
+insert into t1 values('');
+create index t1a1 on t1(a(1));
+drop table t1;
 
 eval set global innodb_file_per_table=$per_table;
 eval set global innodb_file_format=$format;

=== modified file 'storage/innodb_plugin/row/row0merge.c'
--- a/storage/innodb_plugin/row/row0merge.c	revid:marko.makela@stripped
+++ b/storage/innodb_plugin/row/row0merge.c	revid:marko.makela@stripped
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2005, 2010, Innobase Oy. All Rights Reserved.
+Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -576,7 +576,7 @@ row_merge_buf_write(
 						   REC_STATUS_ORDINARY,
 						   entry, n_fields,
 						   &extra_size);
-		ut_ad(size > extra_size);
+		ut_ad(size >= extra_size);
 		ut_ad(extra_size >= REC_N_NEW_EXTRA_BYTES);
 		extra_size -= REC_N_NEW_EXTRA_BYTES;
 		size -= REC_N_NEW_EXTRA_BYTES;

No bundle (reason: useless for push emails).