summaryrefslogtreecommitdiff
path: root/mysql-test/main/view.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-07-27 17:52:37 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-07-27 17:52:37 +0300
commit30914389fe9ca13cf29470dd033a5cf6997a3931 (patch)
treefac7ab85411e556db4759a9a2c063ef27b851f87 /mysql-test/main/view.result
parent772e3f61eb2956143bbdb1d85490bd5aad73d43c (diff)
parent098c0f2634a35e24e9eb0f06d3fba69d0d097657 (diff)
downloadmariadb-git-30914389fe9ca13cf29470dd033a5cf6997a3931.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/view.result')
-rw-r--r--mysql-test/main/view.result31
1 files changed, 26 insertions, 5 deletions
diff --git a/mysql-test/main/view.result b/mysql-test/main/view.result
index 5eee5105f6d..5cf513148e5 100644
--- a/mysql-test/main/view.result
+++ b/mysql-test/main/view.result
@@ -1503,6 +1503,8 @@ execute stmt1 using @a;
set @a= 301;
execute stmt1 using @a;
deallocate prepare stmt1;
+insert into v3(a) select sum(302);
+insert into v3(a) select sum(303) over ();
select * from v3;
a b
100 0
@@ -1521,6 +1523,14 @@ a b
301 10
301 1000
301 2000
+302 0
+302 10
+302 1000
+302 2000
+303 0
+303 10
+303 1000
+303 2000
drop view v3;
drop tables t1,t2;
create table t1(f1 int);
@@ -6148,11 +6158,11 @@ CREATE VIEW v1 AS SELECT * FROM t1;
SELECT * FROM t1 WHERE a <> 0 AND a = ' 1';
a
Warnings:
-Warning 1292 Truncated incorrect DOUBLE value: '`1'
+Warning 1292 Truncated incorrect DECIMAL value: '`1'
SELECT * FROM v1 WHERE a <> 0 AND a = ' 1';
a
Warnings:
-Warning 1292 Truncated incorrect DOUBLE value: '`1'
+Warning 1292 Truncated incorrect DECIMAL value: '`1'
DROP VIEW v1;
DROP TABLE t1;
CREATE TABLE t1 (a ENUM('5','6'));
@@ -6175,11 +6185,11 @@ CREATE VIEW v1 AS SELECT * FROM t1;
SELECT * FROM t1 WHERE a <> 0 AND a = ' 1';
a
Warnings:
-Warning 1292 Truncated incorrect DOUBLE value: '`1'
+Warning 1292 Truncated incorrect DECIMAL value: '`1'
SELECT * FROM v1 WHERE a <> 0 AND a = ' 1';
a
Warnings:
-Warning 1292 Truncated incorrect DOUBLE value: '`1'
+Warning 1292 Truncated incorrect DECIMAL value: '`1'
DROP VIEW v1;
DROP TABLE t1;
CREATE TABLE t1 (a ENUM('5','6'));
@@ -6892,8 +6902,19 @@ CREATE TABLE t4 AS SELECT * FROM t1 JOIN t2 ON t1.x > t2.b;
ERROR 42S22: Unknown column 't1.x' in 'on clause'
DROP TABLE t1,t2,t3;
#
-# End of 10.4 tests
+# MDEV-29088: view specification contains unknown column in ON condition
#
+create table t1 (a int);
+create table t2 (b int);
+create table t3 (c int);
+create view v as
+select * from t1 left join t2 on t1.a=t2.b and t1.a in (select d from t3);
+ERROR 42S22: Unknown column 'd' in 'field list'
+create algorithm=merge view v as
+select * from t1 left join t2 on t1.a=t2.b and t1.a in (select d from t3);
+ERROR 42S22: Unknown column 'd' in 'field list'
+drop table t1,t2,t3;
+# End of 10.4 tests
#
# MDEV-13115: SELECT .. SKIP LOCKED - ensure SHOW CREATE VIEW is correct
#