Commit 099d2bfb authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1


configure.in:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_cache.cc:
  merge
sql/sql_lex.h:
  merge
parents 90ab6eed 56cccee2

mysql-test/r/sp.result

+54 −0
Original line number Diff line number Diff line
@@ -4099,4 +4099,58 @@ call bug14376(4711)| 
x

4711

drop procedure bug14376|

drop procedure if exists p1|

Warnings:

Note	1305	PROCEDURE p1 does not exist

drop table if exists t1|

create table t1 (a varchar(255))|

insert into t1 (a) values ("a - table column")|

create procedure p1(a varchar(255))

begin

declare i varchar(255);

declare c cursor for select a from t1;

select a;

select a from t1 into i;

select i as 'Parameter takes precedence over table column';                     open c;

fetch c into i;

close c;

select i as 'Parameter takes precedence over table column in cursors';

begin

declare a varchar(255) default 'a - local variable';

declare c1 cursor for select a from t1;

select a as 'A local variable takes precedence over parameter';

open c1;

fetch c1 into i;

close c1;

select i as 'A local variable takes precedence over parameter in cursors';

begin

declare a varchar(255) default 'a - local variable in a nested compound statement';

declare c2 cursor for select a from t1;

select a as 'A local variable in a nested compound statement takes precedence over a local variable in the outer statement';

select a from t1 into i;

select i as  'A local variable in a nested compound statement takes precedence over table column';

open c2;

fetch c2 into i;

close c2;

select i as  'A local variable in a nested compound statement takes precedence over table column in cursors';

end;

end;

end|

call p1("a - stored procedure parameter")|

a

a - stored procedure parameter

Parameter takes precedence over table column

a - stored procedure parameter

Parameter takes precedence over table column in cursors

a - stored procedure parameter

A local variable takes precedence over parameter

a - local variable

A local variable takes precedence over parameter in cursors

a - local variable

A local variable in a nested compound statement takes precedence over a local variable in the outer statement

a - local variable in a nested compound statement

A local variable in a nested compound statement takes precedence over table column

a - local variable in a nested compound statement

A local variable in a nested compound statement takes precedence over table column in cursors

a - local variable in a nested compound statement

drop table t1,t2;

mysql-test/r/view.result

+27 −0
Original line number Diff line number Diff line
@@ -2424,3 +2424,30 @@ f1 sum(f2) 
NULL	12

drop view v1;

drop table t1;

drop procedure if exists p1;

create procedure p1 () deterministic

begin

create view v1 as select 1;

end;

//

call p1();

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 AS `1`

drop view v1;

drop procedure p1;

CREATE VIEW v1 AS SELECT 42 AS Meaning;

DROP FUNCTION IF EXISTS f1;

CREATE FUNCTION f1() RETURNS INTEGER

BEGIN

DECLARE retn INTEGER;

SELECT Meaning FROM v1 INTO retn;

RETURN retn;

END

//

CREATE VIEW v2 AS SELECT f1();

select * from v2;

f1()

42

drop view v2,v1;

drop function f1;

mysql-test/r/view_query_cache.result

+61 −0
Original line number Diff line number Diff line
@@ -132,4 +132,65 @@ unlock tables; 
set query_cache_wlock_invalidate=default;

drop view v1;

drop table t1;

flush status;

create table t1 (a int, b int);

create algorithm=temptable view v1 as select * from t1;

select * from v1;

a	b

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	1

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from v1;

a	b

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	1

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

insert into t1 values (1,1);

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	1

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	1

select * from v1;

a	b

1	1

select * from v1;

a	b

1	1

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	1

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	2

drop view v1;

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

show status like "Qcache_inserts";

Variable_name	Value

Qcache_inserts	2

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	2

drop table t1;

set GLOBAL query_cache_size=default;

mysql-test/t/query_cache.test

+0 −1
Original line number Diff line number Diff line
@@ -760,7 +760,6 @@ show status like "Qcache_queries_in_cache"; 
show status like "Qcache_inserts";

show status like "Qcache_hits";

drop table t1;



# SP cursors and selects with query cache (BUG#9715)

#

create table t1 (a int);

mysql-test/t/sp.test

+45 −0
Original line number Diff line number Diff line
@@ -4898,7 +4898,52 @@ call bug14376(4711)| 


drop procedure bug14376|



#

# Bug#5967 "Stored procedure declared variable used instead of column"

# The bug should be fixed later.

# Test precedence of names of parameters, variable declarations, 

# variable declarations in nested compound statements, table columns,

# table columns in cursor declarations.

# According to the standard, table columns take precedence over

# variable declarations. In MySQL 5.0 it's vice versa.

#



drop procedure if exists p1|

drop table if exists t1|

create table t1 (a varchar(255))|

insert into t1 (a) values ("a - table column")|

create procedure p1(a varchar(255))

begin

  declare i varchar(255);

  declare c cursor for select a from t1;

  select a;

  select a from t1 into i;

  select i as 'Parameter takes precedence over table column';                     open c;

  fetch c into i;

  close c;

  select i as 'Parameter takes precedence over table column in cursors';

  begin

    declare a varchar(255) default 'a - local variable';

    declare c1 cursor for select a from t1;

    select a as 'A local variable takes precedence over parameter';

    open c1;

    fetch c1 into i;

    close c1;

    select i as 'A local variable takes precedence over parameter in cursors';

    begin

      declare a varchar(255) default 'a - local variable in a nested compound statement';

      declare c2 cursor for select a from t1;

      select a as 'A local variable in a nested compound statement takes precedence over a local variable in the outer statement';

      select a from t1 into i;

      select i as  'A local variable in a nested compound statement takes precedence over table column';

      open c2;

      fetch c2 into i;

      close c2;

      select i as  'A local variable in a nested compound statement takes precedence over table column in cursors';

    end;

  end;

end|

call p1("a - stored procedure parameter")|



#

# BUG#NNNN: New bug synopsis