Commit b38d9982 authored by unknown's avatar unknown
Browse files

merge fixes 


mysql-test/t/view.test:
  moved the new error message last
sql/share/errmsg.txt:
  moved the new error message last
parent 08f6fca4

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 1471

-- error 1573

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

# try insert to VIEW with expression in SELECT list

-- error 1471

-- error 1573

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

# try insert to VIEW using temporary table algorithm

-- error 1471

-- error 1573

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 1471

-- error 1573

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

# try insert to VIEW with expression in SELECT list

-- error 1471

-- error 1573

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

# try insert to VIEW using temporary table algorithm

-- error 1471

-- error 1573

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 1471

-- error 1573

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 1471

-- error 1573

insert into v3 values (30);

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

-- error 1471

-- error 1573

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 1471

--error 1573

insert into v1 values (1,1); 

update v1 set a = 5;

drop view v1;

sql/share/errmsg.txt

+2 −2
Original line number Diff line number Diff line
@@ -5986,10 +5986,10 @@ ER_HOSTNAME 
	eng "host name"

ER_WRONG_STRING_LENGTH

	eng "String '%-.70s' is too long for %s (should be no longer than %d)"

ER_NON_INSERTABLE_TABLE  

	eng "The target table %-.100s of the %s is not insertable-into"

ER_UNSUPORTED_LOG_ENGINE

        eng "This storage engine cannot be used for log tables""

ER_BAD_LOG_STATEMENT

        eng "You cannot '%s' a log table if logging is enabled"

ER_NON_INSERTABLE_TABLE  

	eng "The target table %-.100s of the %s is not insertable-into"