diff options
author | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-11-21 22:25:53 +0200 |
commit | c58d9d9a9dda3037db574bbf97b22e7c1c274e02 (patch) | |
tree | 54ccfe80d1405cb4325209020ea3c34d86a60770 /mysql-test/r/select.result | |
parent | 33fc0d53b543032accea2476a4eed0522cead2bb (diff) | |
download | mariadb-git-c58d9d9a9dda3037db574bbf97b22e7c1c274e02.tar.gz |
Fixes after merge with 4.0
mysql-test/r/heap_btree.result:
Updated results
mysql-test/r/heap_hash.result:
Updated results
mysql-test/r/merge.result:
Updated results
mysql-test/r/rpl_log.result:
Updated results
mysql-test/r/select.result:
Updated results
mysql-test/r/subselect.result:
Updated results
sql/item_cmpfunc.h:
Fix after merge
sql/log_event.cc:
Fix after merge
sql/mysql_priv.h:
Fix after merge
sql/sql_acl.cc:
Fix after merge
sql/sql_class.cc:
Fix after merge
sql/sql_db.cc:
Fix after merge
sql/sql_delete.cc:
Fix after merge
sql/sql_lex.cc:
Fix after merge
sql/sql_lex.h:
Fix after merge
sql/sql_parse.cc:
Fix after merge
sql/sql_update.cc:
Fix after merge
sql/sql_yacc.yy:
Fix after merge
Diffstat (limited to 'mysql-test/r/select.result')
-rw-r--r-- | mysql-test/r/select.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 2615ee542e3..94c93dbc3dc 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -1331,10 +1331,10 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index explain select fld3 from t2 ignore index (fld3) where fld3 = 'honeysuckle'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 index NULL fld3 30 NULL 1199 Using where; Using index +1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where explain select fld3 from t2 use index (fld1) where fld3 = 'honeysuckle'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 index NULL fld3 30 NULL 1199 Using where; Using index +1 SIMPLE t2 ALL NULL NULL NULL NULL 1199 Using where explain select fld3 from t2 use index (fld3) where fld3 = 'honeysuckle'; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 ref fld3 fld3 30 const 1 Using where; Using index |