summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb.result
diff options
context:
space:
mode:
authorunknown <ingo@mysql.com>2006-02-16 08:59:55 +0100
committerunknown <ingo@mysql.com>2006-02-16 08:59:55 +0100
commit4ecc62881fd6dd002883c49c1ba60ec143e0fbac (patch)
treef2ff6e74654e4d35059d6589b79b5ec2005b2164 /mysql-test/r/innodb.result
parent82f645531ca1843de7651102e8653fdee1faf5a6 (diff)
parent08394605dcab41c0c940f6b0b461e36dc8ef2f6b (diff)
downloadmariadb-git-4ecc62881fd6dd002883c49c1ba60ec143e0fbac.tar.gz
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug8841 mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged
Diffstat (limited to 'mysql-test/r/innodb.result')
-rw-r--r--mysql-test/r/innodb.result10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 163b9302b5c..026ad53193d 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1457,16 +1457,16 @@ Error 1146 Table 'test.t4' doesn't exist
checksum table t1, t2, t3, t4;
Table Checksum
test.t1 2948697075
-test.t2 3835700799
-test.t3 3835700799
+test.t2 2948697075
+test.t3 2948697075
test.t4 NULL
Warnings:
Error 1146 Table 'test.t4' doesn't exist
checksum table t1, t2, t3, t4 extended;
Table Checksum
-test.t1 3092701434
-test.t2 3835700799
-test.t3 3835700799
+test.t1 2948697075
+test.t2 2948697075
+test.t3 2948697075
test.t4 NULL
Warnings:
Error 1146 Table 'test.t4' doesn't exist