Commit 1264c582 authored by unknown's avatar unknown
Browse files

Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-build 

into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
parents 2894e817 49b66418

mysql-test/r/view.result

+10 −8
Original line number Diff line number Diff line
@@ -834,14 +834,16 @@ show create view v1; 
View	Create View

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

drop view v1;

create table t (c char);

create view v as select c from t;

insert into v values ('');

select * from v;

c



drop view v;

drop table t;

set names utf8;

create table tü (cü char);

create view vü as select cü from tü;

insert into vü values ('ü');

select * from vü;

cü

ü

drop view vü;

drop table tü;

set names latin1;

create table t1 (a int, b int);

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

create view v1(c) as select a+1 from t1 where b >= 4;

mysql-test/t/view.test

+8 −6
Original line number Diff line number Diff line
@@ -748,12 +748,14 @@ drop view v1; 
#

# VIEWs with national characters

#

create table t (c char);

create view v as select c from t;

insert into v values ('');

select * from v;

drop view v;

drop table t;

set names utf8;

create table tü (cü char);

create view vü as select cü from tü;

insert into vü values ('ü');

select * from vü;

drop view vü;

drop table tü;

set names latin1;



#

# problem with used_tables() of outer reference resolved in VIEW