Commit d29438f2 authored by unknown's avatar unknown
Browse files

Manually merged 


sql/sql_view.cc:
  Auto merged
parents 57ad6b20 56f43d9d

mysql-test/r/view.result

+8 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/view.test

+9 −0
Original line number Diff line number Diff line
@@ -2190,6 +2190,15 @@ DROP VIEW v1,v2; 
DROP TABLE t1,t2,t3;



#

# Bug #13622 Wrong view .frm created if some field's alias contain \n

#

create table t1 (f1 int);

create view v1 as select t1.f1 as '123

456' from t1;

select * from v1;

drop view v1;

drop table t1;



# Bug #14466 lost sort order in GROUP_CONCAT() in a view

#

create table t1 (f1 int, f2 int);

sql/sql_view.cc

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static const int num_view_backups= 3; 
static File_option view_parameters[]=

{{{(char*) STRING_WITH_LEN("query")},

  offsetof(TABLE_LIST, query),

  FILE_OPTIONS_STRING},

  FILE_OPTIONS_ESTRING},

 {{(char*) STRING_WITH_LEN("md5")},

  offsetof(TABLE_LIST, md5),

  FILE_OPTIONS_STRING},