summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-02-16 15:41:46 +0200
committerMarko Mäkelä <marko.makela@oracle.com>2011-02-16 15:41:46 +0200
commit11cbe8743b953e8f9d685e340c4225be0ceb82a6 (patch)
tree79de95b4c6566cda18af69c9e286477cf938d39f /mysql-test
parentcfc9176bce1493f2e0752e8f89b6ffc6b9beee15 (diff)
parentafda842f02f7a7dc7937200ea5622f8904d5f605 (diff)
downloadmariadb-git-11cbe8743b953e8f9d685e340c4225be0ceb82a6.tar.gz
Merge mysql-5.1-innodb to mysql-5.5-innodb.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug60049.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug60049.test b/mysql-test/suite/innodb/t/innodb_bug60049.test
index 1e0feaf0c89..cff1c3dc09d 100644
--- a/mysql-test/suite/innodb/t/innodb_bug60049.test
+++ b/mysql-test/suite/innodb/t/innodb_bug60049.test
@@ -23,13 +23,13 @@ open(FILE, "<$file") || die "Unable to open $file";
# 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.