Commit 4062f0d6 authored by unknown's avatar unknown
Browse files

Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/sp_head.cc:
  Auto merged
parents 7a43b4c6 4ef3e54b

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ bar@deer.(none) 
bar@gw.udmsearch.izhnet.ru

bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@51.0.168.192.in-addr.arpa

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk

mysql-test/r/sp.result

+12 −0
Original line number Diff line number Diff line
@@ -2480,5 +2480,17 @@ ERROR 42000: Can't find any matching row in the user table 
select bug5278()|

ERROR 42000: Can't find any matching row in the user table

drop function bug5278|

drop procedure if exists p1|

create table t3(id int)|

insert into t3 values(1)|

create procedure bug7992()

begin

declare i int;

select max(id)+1 into i from t3;

end|

call bug7992()|

call bug7992()|

drop procedure bug7992|

drop table t3|

drop table t1;

drop table t2;

mysql-test/r/view_query_cache.result

+25 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2,v1,v2,v3;

drop view if exists t1,t2,v1,v2,v3;

set GLOBAL query_cache_size=1355776;

flush status;

create table t1 (a int, b int);
@@ -98,4 +100,27 @@ Qcache_hits 1 
drop view v1;

set query_cache_type=default;

drop table t1;

create table t1 (a int);

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

create view v1 as select a from t1 where a > 1;

select * from v1;

a

2

3

alter view v1 as select a from t1 where a > 2;

select * from v1;

a

3

drop view v1;

select * from v1;

ERROR 42S02: Table 'test.v1' doesn't exist

drop table t1;

create table t1 (a int, primary key (a), b int);

create table t2 (a int, primary key (a), b int);

insert into t2 values (1000, 2000);

create view v3 (a,b) as select t1.a as a, t2.a as b from t1, t2;

select * from v3;

a	b

drop view v3;

drop table t1, t2;

set GLOBAL query_cache_size=default;

mysql-test/t/sp.test

+19 −0
Original line number Diff line number Diff line
@@ -2982,7 +2982,26 @@ select bug5278()| 
select bug5278()|

drop function bug5278|



#

# BUG#7992: rolling back temporary Item tree changes in SP

#

--disable_warnings

drop procedure if exists p1|

--enable_warnings

create table t3(id int)|

insert into t3 values(1)|

create procedure bug7992()

begin

  declare i int;

  select max(id)+1 into i from t3;

end|



call bug7992()|

call bug7992()|

drop procedure bug7992|

drop table t3|



delimiter ;|

drop table t1;

drop table t2;

mysql-test/t/view_query_cache.test

+30 −1
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 
#

# QUERY CACHE options for VIEWs

#

--disable_warnings

drop table if exists t1,t2,v1,v2,v3;

drop view if exists t1,t2,v1,v2,v3;

--enable_warnings



set GLOBAL query_cache_size=1355776;

flush status;

create table t1 (a int, b int);
@@ -53,6 +58,30 @@ drop view v1; 
set query_cache_type=default;



drop table t1;

set GLOBAL query_cache_size=default;



#

# invalidation of view

#

create table t1 (a int);

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

create view v1 as select a from t1 where a > 1;

select * from v1;

alter view v1 as select a from t1 where a > 2;

select * from v1;

drop view v1;

-- error 1146

select * from v1;

drop table t1;



#

# join view with QC

#

create table t1 (a int, primary key (a), b int);

create table t2 (a int, primary key (a), b int);

insert into t2 values (1000, 2000);

create view v3 (a,b) as select t1.a as a, t2.a as b from t1, t2;

select * from v3;

drop view v3;

drop table t1, t2;



set GLOBAL query_cache_size=default;