diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-08-22 18:43:46 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-08-22 18:43:46 +0300 |
| commit | 484a7f61a84912e8506772ae4cbee3880e140b70 (patch) | |
| tree | 6116b622fcbb528013b9fec903f0efd6927f75e2 /mysql-test/t/select_safe.test | |
| parent | bd6347df9318f46f715615e2a33ff9ba2d9dbb59 (diff) | |
| parent | f300d40aa74525cd4ef2d434f396d70a253fe211 (diff) | |
| download | mariadb-git-484a7f61a84912e8506772ae4cbee3880e140b70.tar.gz | |
After merge fixes
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/select_safe.test')
| -rw-r--r-- | mysql-test/t/select_safe.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/select_safe.test b/mysql-test/t/select_safe.test index 206f911d028..904479635c2 100644 --- a/mysql-test/t/select_safe.test +++ b/mysql-test/t/select_safe.test @@ -56,9 +56,9 @@ SELECT * from t1; SELECT @@MAX_SEEKS_FOR_KEY; analyze table t1; insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"); -explain select * from t1,t1 as t2 where t1.b=t2.b; +explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; set MAX_SEEKS_FOR_KEY=1; -explain select * from t1,t1 as t2 where t1.b=t2.b; +explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; SET MAX_SEEKS_FOR_KEY=DEFAULT; drop table t1; |