bzr push into mysql-trunk-innodb branch (marko.makela:3502 to 3503)

[marko.makela]

 3503 Marko Mäkelä	2011-02-16 [merge]
      Merge mysql-5.5-innodb to mysql-trunk-innodb.

    modified:
      mysql-test/suite/innodb/t/innodb_bug60049.test
 3502 Marko Mäkelä	2011-02-15
      Bug#60049 Clarify the comments in row_ins_must_modify()
      
      row_ins_must_modify_rec(): Renamed from row_ins_must_modify().
      Change the return type to ibool. Make the parameter const.
      Clarify why we only allow updating the previous record in place.
      
      ROW_INS_PREV, ROW_INS_NEXT: Remove. These were the nonzero return
      values of row_ins_must_modify(). ROW_INS_NEXT was never returned.
      
      row_ins_index_entry_low(): Change the type of "modify" to ibool.
      Remove the handling for ROW_INS_NEXT, which was never returned.
      
      btr_cur_get_block(), btr_cur_get_rec(): Define as constness-preserving
      macros.

    modified:
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0cur.ic
      storage/innobase/row/row0ins.c
=== modified file 'mysql-test/suite/innodb/t/innodb_bug60049.test'
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:[e-mail]-20110215104253-rk0nqzdo0m6f7bb1
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:[e-mail]-20110216134402-jk1edx1dzy398x8g
@@ -23,13 +23,13 @@ open(FILE, "<$file") || die "Unable to o
 # Read DICT_HDR_TABLE_IDS, the root page number of ID_IND (SYS_TABLES.ID).
 seek(FILE, 7*16384+38+36, 0) || die "Unable to seek $file";
 die unless read(FILE, $_, 4) == 4;
-my $sys_tables_id_root = unpack "N";
+my $sys_tables_id_root = unpack("N", $_);
 print "Last record of ID_IND root page ($sys_tables_id_root):\n";
 # This should be the last record in ID_IND. Dump it in hexadecimal.
 seek(FILE, $sys_tables_id_root*16384 + 152, 0) || die "Unable to seek $file";
 read(FILE, $_, 32) || die "Unable to read $file";
 close(FILE);
-print unpack("H*"),"\n";
+print unpack("H*", $_), "\n";
 EOF
 
 # Restart the server.

Attachment: [text/bzr-bundle] bzr/[e-mail]