diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:30:24 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-16 19:30:24 +0300 |
| commit | b3cb7b7f7742f691c9a14598e455b4ecb96f07e1 (patch) | |
| tree | fd68b42f3c1b7e47b36b19209daf540c3a0c7a68 /mysql-test/r/key_diff.result | |
| parent | 6f38e3083f0d867af8d1499fba92c7eaae295726 (diff) | |
| parent | aee5ef8516ce0599402ca8e8a6b72f3eca36739b (diff) | |
| download | mariadb-git-b3cb7b7f7742f691c9a14598e455b4ecb96f07e1.tar.gz | |
merge with 4.0.5
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/key_diff.result')
| -rw-r--r-- | mysql-test/r/key_diff.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/key_diff.result b/mysql-test/r/key_diff.result index 0886850f38a..bdeff4f60d8 100644 --- a/mysql-test/r/key_diff.result +++ b/mysql-test/r/key_diff.result @@ -34,9 +34,9 @@ C c a a D E a a a a a a explain select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B; -table type possible_keys key key_len ref rows Extra -t1 ALL a NULL NULL NULL 5 -t2 ALL b NULL NULL NULL 5 where used +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 ALL a NULL NULL NULL 5 +1 SIMPLE t2 ALL b NULL NULL NULL 5 where used select t1.*,t2.* from t1,t1 as t2 where t1.A=t2.B order by binary t1.a,t2.a; a b a b A B a a |