database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Manually merged

Browse Source 
sql/sql_view.cc:
  Auto merged
This commit is contained in:
unknown
2005-11-18 01:16:15 +03:00
parent 57ad6b20ed 56f43d9d02
commit d29438f25e
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/view.result
View File

@@ -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 1 PRIMARY t3 ALL NULL NULL NULL NULL 3 Using where
DROP VIEW v1,v2; DROP VIEW v1,v2;
DROP TABLE t1,t2,t3; 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); create table t1 (f1 int, f2 int);
insert into t1 values(1,1),(1,2),(1,3); 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; create view v1 as select f1 ,group_concat(f2 order by f2 asc) from t1 group by f1;

9
mysql-test/t/view.test
View File

@@ -2190,6 +2190,15 @@ DROP VIEW v1,v2;
DROP TABLE t1,t2,t3; 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 # Bug #14466 lost sort order in GROUP_CONCAT() in a view
# #
create table t1 (f1 int, f2 int); create table t1 (f1 int, f2 int);

2
sql/sql_view.cc
View File

@@ -495,7 +495,7 @@ static const int num_view_backups= 3;
static File_option view_parameters[]= static File_option view_parameters[]=
{{{(char*) STRING_WITH_LEN("query")}, {{{(char*) STRING_WITH_LEN("query")},
offsetof(TABLE_LIST, query), offsetof(TABLE_LIST, query),
FILE_OPTIONS_STRING}, FILE_OPTIONS_ESTRING},
{{(char*) STRING_WITH_LEN("md5")}, {{(char*) STRING_WITH_LEN("md5")},
offsetof(TABLE_LIST, md5), offsetof(TABLE_LIST, md5),
FILE_OPTIONS_STRING}, FILE_OPTIONS_STRING},