List:Commits« Previous MessageNext Message »
From:marko.makela Date:February 16 2011 1:34pm
Subject:bzr commit into mysql-5.1-innodb branch (marko.makela:3710) Bug#60049
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ based on revid:marko.makela@strippedpdn9038c5ixn

 3710 Marko Mäkelä	2011-02-16
      Make the implicit unpack parameter explicit in the Bug #60049 test.

    modified:
      mysql-test/suite/innodb/t/innodb_bug60049.test
      mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
=== modified file 'mysql-test/suite/innodb/t/innodb_bug60049.test'
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:marko.makela@stripped0110215101227-tjx4pdn9038c5ixn
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test	revid:marko.makela@stripped20110216133416-oieu7dmcy9jlon77
@@ -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.

=== modified file 'mysql-test/suite/innodb_plugin/t/innodb_bug60049.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test	revid:marko.makela@stripped
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug60049.test	revid:marko.makela@strippedjlon77
@@ -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/marko.makela@oracle.com-20110216133416-oieu7dmcy9jlon77.bundle
Thread
bzr commit into mysql-5.1-innodb branch (marko.makela:3710) Bug#60049marko.makela16 Feb