bzr push into mysql-5.5-innodb branch (marko.makela:3321 to 3322)

[marko.makela]

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

    modified:
      mysql-test/suite/innodb/t/innodb_bug60049.test
 3321 Marko Mäkelä	2011-02-15 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    added:
      mysql-test/suite/innodb/r/innodb_bug60049.result
      mysql-test/suite/innodb/t/innodb_bug60049-master.opt
      mysql-test/suite/innodb/t/innodb_bug60049.test
=== modified file 'mysql-test/suite/innodb/t/innodb_bug60049.test'
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:[e-mail]-20110215101815-jibmb0mfx04lp8g0
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:[e-mail]-20110216134146-qgx5b63yyjxc3kc9
@@ -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]