bk commit into 5.0 tree (evgen:1.1972)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1972 05/11/18 01:16:15 evgen@stripped +3 -0
  Manually merged

  mysql-test/t/view.test
    1.125 05/11/18 01:16:13 evgen@stripped +1 -1
    Manually merged

  mysql-test/r/view.result
    1.135 05/11/18 01:16:13 evgen@stripped +0 -0
    Manually merged

  sql/sql_view.cc
    1.77 05/11/18 01:12:34 evgen@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	evgen
# Host:	moonbone.local
# Root:	/work/13622-bug-5.0-mysql/RESYNC

--- 1.134/mysql-test/r/view.result	2005-11-16 02:08:19 +03:00
+++ 1.135/mysql-test/r/view.result	2005-11-18 01:16:13 +03:00
@@ -2323,6 +2323,14 @@
 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;

--- 1.124/mysql-test/t/view.test	2005-11-16 02:08:19 +03:00
+++ 1.125/mysql-test/t/view.test	2005-11-18 01:16:13 +03:00
@@ -2190,6 +2190,15 @@
 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);

--- 1.76/sql/sql_view.cc	2005-11-10 22:24:54 +03:00
+++ 1.77/sql/sql_view.cc	2005-11-18 01:12:34 +03:00
@@ -495,7 +495,7 @@
 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},