Commit 4dc33bc8 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/usr/home/ram/work/4.1.b6089


sql/sql_select.cc:
  Auto merged
parents f9dd79c7 d2ead18b

mysql-test/r/select_safe.result

+15 −0
Original line number Diff line number Diff line
@@ -78,4 +78,19 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	ref	b	b	21	test.t1.b	6	Using where

SET MAX_SEEKS_FOR_KEY=DEFAULT;

drop table t1;

create table t1 (a int);

insert into t1 values (1),(2),(3),(4),(5);

insert into t1 select * from t1;

insert into t1 select * from t1;

insert into t1 select * from t1;

set local  max_join_size=8;

select * from (select * from t1) x;

ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay

set local  max_join_size=1;

select * from (select * from t1 a, t1 b) x;

ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay

set local  max_join_size=1;

select * from (select 1 union select 2 union select 3) x;

ERROR 42000: The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay

drop table t1;

SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, SQL_MAX_JOIN_SIZE=DEFAULT;

mysql-test/t/select_safe.test

+20 −0
Original line number Diff line number Diff line
@@ -66,4 +66,24 @@ SET MAX_SEEKS_FOR_KEY=DEFAULT; 


drop table t1;



# BUG#8726

create table t1 (a int);

insert into t1 values (1),(2),(3),(4),(5);

insert into t1 select * from t1;

insert into t1 select * from t1;

insert into t1 select * from t1;



set local  max_join_size=8;

--error 1104

select * from (select * from t1) x;



set local  max_join_size=1;

--error 1104

select * from (select * from t1 a, t1 b) x;



set local  max_join_size=1;

--error 1104

select * from (select 1 union select 2 union select 3) x;

drop table t1;



SET SQL_SAFE_UPDATES=0,SQL_SELECT_LIMIT=DEFAULT, SQL_MAX_JOIN_SIZE=DEFAULT;

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ JOIN::optimize() 
      !(select_options & SELECT_DESCRIBE))

  {						/* purecov: inspected */

    my_message(ER_TOO_BIG_SELECT, ER(ER_TOO_BIG_SELECT), MYF(0));

    error= 1;					/* purecov: inspected */

    error= -1;

    DBUG_RETURN(1);

  }

  if (const_tables && !thd->locked_tables &&