summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-10-04 21:37:51 +0200
committerunknown <serg@serg.mylan>2005-10-04 21:37:51 +0200
commit14f24b5ed63394dce856bff08ea6e1b2bc0752c6 (patch)
treeb37ed6c6ded200c133795d20b220b12dc3e9bcb4
parent6f9ad424bcbd81611e2e6a9c17bf27bf8664dfa7 (diff)
parent8a1490ed9bf158824abe97b16a7ef6bbf729d672 (diff)
downloadmariadb-git-14f24b5ed63394dce856bff08ea6e1b2bc0752c6.tar.gz
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
-rw-r--r--mysql-test/r/innodb.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index f634d0fc98b..a66259ff5f4 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -2625,11 +2625,11 @@ test.t1 1531596814
insert into t1 values(3);
checksum table t1;
Table Checksum
-test.t1 2605035534
+test.t1 1531596814
commit;
checksum table t1;
Table Checksum
-test.t1 127268899
+test.t1 2050879373
commit;
drop table t1;
create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1;
@@ -2642,7 +2642,7 @@ set autocommit=1;
insert into t1 values(3);
checksum table t1;
Table Checksum
-test.t1 127268899
+test.t1 2050879373
drop table t1;
create table t1 (col1 integer primary key, col2 integer) engine=innodb;
insert t1 values (1,100);