bzr push into mysql-trunk-wl5534-stage branch (marko.makela:3819 to 3820) Bug#13654923

[marko.makela]

 3820 Marko Mäkelä	2012-02-02
      Bug#13654923 BOGUS DEBUG ASSERTION IN INDEX CREATION FOR ZERO-LENGTH RECORD
      
      Relax debug assertions, to allow a zero-length index record to be created.

    modified:
      storage/innobase/row/row0log.cc
      storage/innobase/row/row0merge.cc
 3819 Jon Olav Hauglid	2012-02-02
      WL#5534 Online ALTER, Phase 1
      
      Follow-up patch: Update copyright messages for
      touched source code files to 2012.

    modified:
      include/mysql_com.h
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/key.cc
      sql/key.h
      sql/mdl.cc
      sql/mdl.h
      sql/sql_admin.cc
      sql/sql_alter.cc
      sql/sql_alter.h
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_partition_admin.cc
      sql/sql_table.cc
      sql/sql_table.h
      sql/sql_trigger.cc
      sql/sql_truncate.cc
      sql/sql_yacc.yy
      sql/unireg.cc
      sql/unireg.h
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
=== modified file 'storage/innobase/row/row0log.cc'
--- a/storage/innobase/row/row0log.cc	revid:jon.hauglid@strippedyrj0dx0v28d
+++ b/storage/innobase/row/row0log.cc	revid:marko.makela@stripped
@@ -140,7 +140,7 @@ op_ok:
 	size = rec_get_converted_size_comp(
 		index, REC_STATUS_ORDINARY,
 		tuple->fields, tuple->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;

=== modified file 'storage/innobase/row/row0merge.cc'
--- a/storage/innobase/row/row0merge.cc	revid:jon.hauglid@stripped-hrpaeyrj0dx0v28d
+++ b/storage/innobase/row/row0merge.cc	revid:marko.makela@strippedgnzq8
@@ -144,7 +144,7 @@ row_merge_buf_encode(
 
 	size = rec_get_converted_size_comp(
 		index, 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;
@@ -495,7 +495,6 @@ row_merge_buf_add(
 
 		ut_ad(data_size + extra == size);
 		ut_ad(extra_size + REC_N_NEW_EXTRA_BYTES == extra);
-		ut_ad(data_size > 0);
 	}
 #endif /* UNIV_DEBUG */
 

No bundle (reason: useless for push emails).