Commit 7e5d7b84 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-5.0
parents 0f8b518b 47dc78e6

mysql-test/r/view.result

+0 −101
Original line number Diff line number Diff line
@@ -363,107 +363,6 @@ v4 CREATE ALGORITHM=TEMPTABLE VIEW `mysqltest`.`v4` AS select (`mysqltest`.`t2`. 
revoke all privileges on mysqltest.* from mysqltest_1@localhost;

delete from mysql.user where user='mysqltest_1';

drop database mysqltest;

set GLOBAL query_cache_size=1355776;

flush status;

create table t1 (a int, b int);

create view v1 (c,d) as select sql_no_cache a,b from t1;

create view v2 (c,d) as select a+rand(),b from t1;

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	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from v1;

c	d

select * from v2;

c	d

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	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from v1;

c	d

select * from v2;

c	d

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	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

drop view v1,v2;

set query_cache_type=demand;

flush status;

create view v1 (c,d) as select sql_cache a,b from t1;

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	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from v1;

c	d

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 t1;

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;

c	d

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

select * from t1;

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

drop view v1;

set query_cache_type=default;

drop table t1;

set GLOBAL query_cache_size=default;

create table t1 (a int);

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

create view v1 as select distinct a from t1;

mysql-test/r/view_query_cache.result

0 → 100644
+101 −0
Original line number Diff line number Diff line 
set GLOBAL query_cache_size=1355776;

flush status;

create table t1 (a int, b int);

create view v1 (c,d) as select sql_no_cache a,b from t1;

create view v2 (c,d) as select a+rand(),b from t1;

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	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from v1;

c	d

select * from v2;

c	d

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	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from v1;

c	d

select * from v2;

c	d

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	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

drop view v1,v2;

set query_cache_type=demand;

flush status;

create view v1 (c,d) as select sql_cache a,b from t1;

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	0

show status like "Qcache_hits";

Variable_name	Value

Qcache_hits	0

select * from v1;

c	d

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 t1;

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;

c	d

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

select * from t1;

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

drop view v1;

set query_cache_type=default;

drop table t1;

set GLOBAL query_cache_size=default;

mysql-test/t/view.test

+0 −57
Original line number Diff line number Diff line
@@ -328,63 +328,6 @@ revoke all privileges on mysqltest.* from mysqltest_1@localhost; 
delete from mysql.user where user='mysqltest_1';

drop database mysqltest;



#

# QUERY CACHE options for VIEWs

#

set GLOBAL query_cache_size=1355776;

flush status;

create table t1 (a int, b int);



# queries with following views should not be in query cache

create view v1 (c,d) as select sql_no_cache a,b from t1;

create view v2 (c,d) as select a+rand(),b from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from v1;

select * from v2;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from v1;

select * from v2;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



drop view v1,v2;



# SQL_CACHE option

set query_cache_type=demand;

flush status;

# query with view will be cached, but direct acess to table will not

create view v1 (c,d) as select sql_cache a,b from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from v1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from v1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

drop view v1;

set query_cache_type=default;



drop table t1;

set GLOBAL query_cache_size=default;





#

# DISTINCT option for VIEW

#

mysql-test/t/view_query_cache.test

0 → 100644
+58 −0
Original line number Diff line number Diff line 
-- source include/have_query_cache.inc

#

# QUERY CACHE options for VIEWs

#

set GLOBAL query_cache_size=1355776;

flush status;

create table t1 (a int, b int);



# queries with following views should not be in query cache

create view v1 (c,d) as select sql_no_cache a,b from t1;

create view v2 (c,d) as select a+rand(),b from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from v1;

select * from v2;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from v1;

select * from v2;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";



drop view v1,v2;



# SQL_CACHE option

set query_cache_type=demand;

flush status;

# query with view will be cached, but direct acess to table will not

create view v1 (c,d) as select sql_cache a,b from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from v1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from v1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

select * from t1;

show status like "Qcache_queries_in_cache";

show status like "Qcache_inserts";

show status like "Qcache_hits";

drop view v1;

set query_cache_type=default;



drop table t1;

set GLOBAL query_cache_size=default;

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ bool Item_func::agg_arg_charsets(DTCollation &coll, 
    }

    if ((*arg)->type() == FIELD_ITEM)

      ((Item_field *)(*arg))->no_const_subst= 1;

    conv->fix_fields(thd, 0, &conv);

    *arg= conv;

    conv->fix_fields(thd, 0, arg);

  }

  if (arena)

    thd->restore_backup_item_arena(arena, &backup);