Commit 4b427bde authored by malff/marcsql@weblab.(none)'s avatar malff/marcsql@weblab.(none)
Browse files

Fixed warnings raised from mysqltest (unknown -- commands)

parent e20232cf

mysql-test/t/greedy_optimizer.test

+2 −2
Original line number Diff line number Diff line
@@ -145,11 +145,11 @@ select @@optimizer_prune_level; 
#

# These are the values for the parameters that control the greedy optimizer

# (total 6 combinations - 3 for optimizer_search_depth, 2 for optimizer_prune_level):

--

# 3:

# set optimizer_search_depth=0;  - automatic

# set optimizer_search_depth=1;  - min

# set optimizer_search_depth=62; - max (default)

--

# 2:

# set optimizer_prune_level=0 - exhaustive;

# set optimizer_prune_level=1 - heuristic; # default

mysql-test/t/join.test

+4 −2
Original line number Diff line number Diff line
@@ -512,10 +512,12 @@ select * from v1a join (t3 natural join t4) on a = y; 
#--------------------------------------------------------------------

# Negative tests (tests for errors)

#--------------------------------------------------------------------

# works in Oracle - bug

-- error 1052

select * from t1 natural join (t3 cross join t4); -- works in Oracle - bug

select * from t1 natural join (t3 cross join t4);

# works in Oracle - bug

-- error 1052

select * from (t3 cross join t4) natural join t1; -- works in Oracle - bug

select * from (t3 cross join t4) natural join t1;

-- error 1052

select * from t1 join (t2, t3) using (b);

-- error 1052

mysql-test/t/ndb_index_ordered.test

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ update t1 set c = 13 where b <= 3; 
select * from t1 order by a;

update t1 set b = b + 1 where b > 4 and b < 7;

select * from t1 order by a;

-- Update primary key

# Update primary key

update t1 set a = a + 10 where b > 1 and b < 7;

select * from t1 order by a;