diff options
| author | unknown <evgen@moonbone.local> | 2005-11-18 22:11:34 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-11-18 22:11:34 +0300 |
| commit | 43262f345a42a15afed16407f1284833701c2f8d (patch) | |
| tree | 0094ec5b74b6fe8f0f0ee8ecd7e7f14229313c67 | |
| parent | fe94b6bfb3f39514d6b7db9333febf34ed8279ab (diff) | |
| parent | 18ca0d63023582d456da9cbb0e47370ed626248d (diff) | |
| download | mariadb-git-43262f345a42a15afed16407f1284833701c2f8d.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/13622-bug-5.0-mysql
| -rw-r--r-- | mysql-test/r/view.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/view.test | 9 | ||||
| -rw-r--r-- | sql/sql_view.cc | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 9a3dc950c10..ebb2c190eb1 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2338,6 +2338,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; diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index ad51597fd6f..ac103278f08 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -2188,6 +2188,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); diff --git a/sql/sql_view.cc b/sql/sql_view.cc index b642d24b30d..4067201bf18 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -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}, |