Manually merged

sql/sql_view.cc:
  Auto merged

1 files changed, 8 insertions, 0 deletions

diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index 42708a7c835..ae92d0178e2 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -2323,6 +2323,14 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where
 DROP VIEW v1,v2;
 DROP TABLE t1,t2,t3;
+create table t1 (f1 int);
+create view v1 as select t1.f1 as '123
+456' from t1;
+select * from v1;
+123
+456
+drop view v1;
+drop table t1;
 create table t1 (f1 int, f2 int);
 insert into t1 values(1,1),(1,2),(1,3);
 create view v1 as select f1 ,group_concat(f2 order by f2 asc) from t1 group by f1;