diff options
author | tsmith/tim@siva.hindu.god <> | 2006-10-24 14:42:08 -0600 |
---|---|---|
committer | tsmith/tim@siva.hindu.god <> | 2006-10-24 14:42:08 -0600 |
commit | 3af2089b13da95ed95f8afa1679e6e10a485815c (patch) | |
tree | f6b3ce247f0c1b8d045348dca4533d282d470935 /mysql-test/r/merge.result | |
parent | 4bd1021a034502878c06b676067ec0a70ba20654 (diff) | |
parent | 837746340e890fb65a9606f26988d2789db755d5 (diff) | |
download | mariadb-git-3af2089b13da95ed95f8afa1679e6e10a485815c.tar.gz |
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into siva.hindu.god:/usr/home/tim/m/bk/50
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r-- | mysql-test/r/merge.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 6a065bd7332..af8a2d61505 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -626,7 +626,7 @@ id select_type table type possible_keys key key_len ref rows Extra EXPLAIN SELECT * FROM t2 WHERE fileset_id = 2 AND file_code = '0000000115' LIMIT 1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ref PRIMARY,files PRIMARY 35 const,const 1 Using where +1 SIMPLE t2 const PRIMARY,files PRIMARY 35 const,const 1 DROP TABLE t2, t1; create table t1 (x int, y int, index xy(x, y)); create table t2 (x int, y int, index xy(x, y)); |