Commit 45c30c7f authored by unknown's avatar unknown
Browse files

Post-merge fixes. 


mysql-test/t/view.test:
  Switching to using symbolic error numbers instead of numbers.
  Using numbers caused test to fail.
parent 5e81d130

mysql-test/t/view.test

+10 −10
Original line number Diff line number Diff line
@@ -347,13 +347,13 @@ create view v3 (x,y,z) as select b, a, b from t1; 
create view v4 (x,y,z) as select c+1, b, a from t1;

create algorithm=temptable view v5 (x,y,z) as select c, b, a from t1;

# try insert to VIEW with fields duplicate

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v3 values (-60,4,30);

# try insert to VIEW with expression in SELECT list

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v4 values (-60,4,30);

# try insert to VIEW using temporary table algorithm

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v5 values (-60,4,30);

insert into v1 values (-60,4,30);

insert into v1 (z,y,x) values (50,6,-100);
@@ -375,13 +375,13 @@ create view v3 (x,y,z) as select b, a, b from t1; 
create view v4 (x,y,z) as select c+1, b, a from t1;

create algorithm=temptable view v5 (x,y,z) as select c, b, a from t1;

# try insert to VIEW with fields duplicate

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v3 select c, b, a from t2;

# try insert to VIEW with expression in SELECT list

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v4 select c, b, a from t2;

# try insert to VIEW using temporary table algorithm

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v5 select c, b, a from t2;

insert into v1 select c, b, a from t2;

insert into v1 (z,y,x) select a+20,b+2,-100 from t2;
@@ -1249,14 +1249,14 @@ drop table t1; 
#

create table t1 (s1 smallint);

create view v1 as select * from t1 where 20 < (select (s1) from t1);

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v1 values (30);

create view v2 as select * from t1;

create view v3 as select * from t1 where 20 < (select (s1) from v2);

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v3 values (30);

create view v4 as select * from v2 where 20 < (select (s1) from t1);

-- error 1573

-- error ER_NON_INSERTABLE_TABLE

insert into v4 values (30);

drop view v4, v3, v2, v1;

drop table t1;
@@ -2861,7 +2861,7 @@ DROP TABLE t1; 
#

create table t1 (s1 int);

create view v1 as select s1 as a, s1 as b from t1;

--error 1573

--error ER_NON_INSERTABLE_TABLE

insert into v1 values (1,1); 

update v1 set a = 5;

drop view v1;