Commit 2313bbc3 authored by gshchepa/uchum@gleb.loc's avatar gshchepa/uchum@gleb.loc
Browse files

Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29338 

into  gleb.loc:/home/uchum/work/bk/5.0-opt
parents 4990843b 73b2848f

mysql-test/r/sp.result

+32 −1
Original line number Diff line number Diff line 
use test;

drop table if exists t1,t2,t3,t4;

drop function if exists f1;

drop function if exists f2;

create table t1 (

id   char(16) not null default '',

data int not null
@@ -6144,7 +6146,7 @@ drop table t1,t2; 
CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;

CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;

set @a=0;

CREATE function bug27354() RETURNS int deterministic

CREATE function bug27354() RETURNS int not deterministic

begin

insert into t1 values (null);

set @a=@a+1;
@@ -6201,4 +6203,33 @@ Level Code Message 
use test;

drop procedure sp_bug29050;

drop table t1;

CREATE FUNCTION f1() RETURNS INT DETERMINISTIC RETURN 2;

CREATE FUNCTION f2(I INT) RETURNS INT DETERMINISTIC RETURN 3;

CREATE TABLE t1 (c1 INT, INDEX(c1));

INSERT INTO t1 VALUES (1), (2), (3), (4), (5);

CREATE VIEW v1 AS SELECT c1 FROM t1;

EXPLAIN SELECT * FROM t1 WHERE c1=1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index

EXPLAIN SELECT * FROM t1 WHERE c1=f1();

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index

EXPLAIN SELECT * FROM v1 WHERE c1=1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index

EXPLAIN SELECT * FROM v1 WHERE c1=f1();

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index

EXPLAIN SELECT * FROM t1 WHERE c1=f2(10);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	c1	c1	5	const	1	Using where; Using index

EXPLAIN SELECT * FROM t1 WHERE c1=f2(c1);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	c1	5	NULL	5	Using where; Using index

EXPLAIN SELECT * FROM t1 WHERE c1=f2(rand());

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	c1	5	NULL	5	Using where; Using index

DROP VIEW v1;

DROP FUNCTION f1;

DROP TABLE t1;

End of 5.0 tests

mysql-test/t/sp.test

+32 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ use test; 
#

--disable_warnings

drop table if exists t1,t2,t3,t4;

drop function if exists f1;

drop function if exists f2;

--enable_warnings

create table t1 (

	id   char(16) not null default '',
@@ -7098,7 +7100,7 @@ CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb; 
set @a=0;



delimiter |;

CREATE function bug27354() RETURNS int deterministic

CREATE function bug27354() RETURNS int not deterministic

begin

insert into t1 values (null);

set @a=@a+1;
@@ -7172,4 +7174,33 @@ use test; 
drop procedure sp_bug29050;

drop table t1;



#

# Bug #29338: no optimization for stored functions with a trivial body

# always returning constant.

#



CREATE FUNCTION f1() RETURNS INT DETERMINISTIC RETURN 2;

CREATE FUNCTION f2(I INT) RETURNS INT DETERMINISTIC RETURN 3;



CREATE TABLE t1 (c1 INT, INDEX(c1));



INSERT INTO t1 VALUES (1), (2), (3), (4), (5);



CREATE VIEW v1 AS SELECT c1 FROM t1;



EXPLAIN SELECT * FROM t1 WHERE c1=1;

EXPLAIN SELECT * FROM t1 WHERE c1=f1();



EXPLAIN SELECT * FROM v1 WHERE c1=1;

EXPLAIN SELECT * FROM v1 WHERE c1=f1();



EXPLAIN SELECT * FROM t1 WHERE c1=f2(10);

EXPLAIN SELECT * FROM t1 WHERE c1=f2(c1);

EXPLAIN SELECT * FROM t1 WHERE c1=f2(rand());





DROP VIEW v1;

DROP FUNCTION f1;

DROP TABLE t1;



--echo End of 5.0 tests

sql/item_func.cc

+10 −0
Original line number Diff line number Diff line
@@ -5591,5 +5591,15 @@ Item_func_sp::fix_fields(THD *thd, Item **ref) 
    

#endif /* ! NO_EMBEDDED_ACCESS_CHECKS */

  }

  if (!m_sp->m_chistics->detistic)

   used_tables_cache |= RAND_TABLE_BIT;

  DBUG_RETURN(res);

}





void Item_func_sp::update_used_tables()

{

  Item_func::update_used_tables();

  if (!m_sp->m_chistics->detistic)

   used_tables_cache |= RAND_TABLE_BIT;

}

sql/item_func.h

+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ class Item_func_sp :public Item_func 
  virtual ~Item_func_sp()

  {}



  table_map used_tables() const { return RAND_TABLE_BIT; }

  void update_used_tables();



  void cleanup();