diff options
| author | unknown <serg@serg.mylan> | 2005-10-04 21:43:56 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-10-04 21:43:56 +0200 |
| commit | 2b972093e78f942f199b20552fb9e949fbfc3265 (patch) | |
| tree | 216fbc8823c2cd43914ee24d01bc1f0f38dc6113 /mysql-test | |
| parent | 60ebe17bd1859f5c541e92b620074e14f36928eb (diff) | |
| parent | 14f24b5ed63394dce856bff08ea6e1b2bc0752c6 (diff) | |
| download | mariadb-git-2b972093e78f942f199b20552fb9e949fbfc3265.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/innodb.result | 6 |
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); |