diff options
author | unknown <cmiller@zippy.(none)> | 2006-04-24 16:05:57 -0400 |
---|---|---|
committer | unknown <cmiller@zippy.(none)> | 2006-04-24 16:05:57 -0400 |
commit | aa19a8f2b4a98f580bd03d7126e5b130d419dcf9 (patch) | |
tree | 2a218a952e1fc79981139514c98bf622e7b9b4cb /mysql-test/r/innodb.result | |
parent | 2a239a4eb1cc51157db94602478063f41339b8aa (diff) | |
download | mariadb-git-aa19a8f2b4a98f580bd03d7126e5b130d419dcf9.tar.gz |
Manual merge fix.
mysql-test/r/innodb.result:
Corrected from manual merge. I know the numbers are right (it's a
7,7-seeded fibbonaci sequence), but I don't know how I missed the latter
line.
Diffstat (limited to 'mysql-test/r/innodb.result')
-rw-r--r-- | mysql-test/r/innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index a7e425cfa4d..f32d7ee264a 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -1305,14 +1305,14 @@ insert into t2 (a) select b from t1; insert into t1 (a) select b from t2; select count(*) from t1; count(*) -623 +29267 explain select * from t1 where c between 1 and 2500; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 range c c 5 NULL # Using where update t1 set c=a; explain select * from t1 where c between 1 and 2500; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 ALL c NULL NULL NULL # Using where +1 SIMPLE t1 range c c 5 NULL # Using where drop table t1,t2; create table t1 (id int primary key auto_increment, fk int, index index_fk (fk)) engine=innodb; insert into t1 (id) values (null),(null),(null),(null),(null); |