Commit 508824f7 authored by evgen@moonbone.local's avatar evgen@moonbone.local

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

View .frm parser assumes that query string will take only 1 line, with \n in
aliases query stringmay take several lines thus produces bad .frm file.

'query' parameter type changed from 'string' to 'escaped string'
parent f3502cd9
...@@ -2323,3 +2323,11 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -2323,3 +2323,11 @@ 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;
...@@ -2189,4 +2189,13 @@ EXPLAIN SELECT * FROM v2 WHERE a=1; ...@@ -2189,4 +2189,13 @@ EXPLAIN SELECT * FROM v2 WHERE a=1;
DROP VIEW v1,v2; 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;
...@@ -496,7 +496,7 @@ static const int num_view_backups= 3; ...@@ -496,7 +496,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},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment