bk commit into 5.0 tree (aivanov:1.1954) BUG#1300

[Alex Ivanov]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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.1954 05/09/14 14:22:02 aivanov@stripped +2 -0
  Merge mysql.com:/home/alexi/mysql-5.0
  into  mysql.com:/home/alexi/dev/mysql-5.0-12963
  BUG#12963, BUG#1300: After pull merge

  mysql-test/t/view.test
    1.107 05/09/14 14:21:54 aivanov@stripped +15 -15
    After pull merge

  mysql-test/r/view.result
    1.113 05/09/14 14:21:54 aivanov@stripped +14 -14
    After pull merge

# 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:	aivanov
# Host:	mysql.creware.com
# Root:	/home/alexi/dev/mysql-5.0-12963/RESYNC

--- 1.112/mysql-test/r/view.result	2005-09-14 10:10:12 +04:00
+++ 1.113/mysql-test/r/view.result	2005-09-14 14:21:54 +04:00
@@ -821,14 +821,14 @@
 View	Create View
 v1	CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select
99999999999999999999999999999999999999999999999999999 AS `col1`
 drop view v1;
-create table tü (cü char);
-create view vü as select cü from tü;
-insert into vü values ('ü');
-select * from vü;
-cü
-ü
-drop view vü;
-drop table tü;
+create table tü (cü char);
+create view vü as select cü from tü;
+insert into vü values ('ü');
+select * from vü;
+cü
+ü
+drop view vü;
+drop table tü;
 create table t1 (a int, b int);
 insert into t1 values (1,2), (1,3), (2,4), (2,5), (3,10);
 create view v1(c) as select a+1 from t1 where b >= 4;
@@ -2196,3 +2196,46 @@
 f2
 drop view v1;
 drop table t1;
+CREATE TABLE t1 (date DATE NOT NULL);
+INSERT INTO  t1 VALUES ('2005-09-06');
+CREATE VIEW v1 AS SELECT WEEKDAY(date) FROM t1;
+SHOW CREATE VIEW v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select weekday(`test`.`t1`.`date`) AS
`WEEKDAY(date)` from `test`.`t1`
+CREATE VIEW v2 AS SELECT DAYOFWEEK(date) FROM t1;
+SHOW CREATE VIEW v2;
+View	Create View
+v2	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v2` AS select dayofweek(`test`.`t1`.`date`) AS
`DAYOFWEEK(date)` from `test`.`t1`
+CREATE VIEW v3 AS SELECT DAYNAME(date) FROM t1;
+SHOW CREATE VIEW v3;
+View	Create View
+v3	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v3` AS select dayname(`test`.`t1`.`date`) AS
`DAYNAME(date)` from `test`.`t1`
+SELECT WEEKDAY('2005-09-06');
+WEEKDAY('2005-09-06')
+1
+SELECT WEEKDAY(date) FROM t1;
+WEEKDAY(date)
+1
+SELECT * FROM v1;
+WEEKDAY(date)
+1
+SELECT DAYOFWEEK('2005-09-06');
+DAYOFWEEK('2005-09-06')
+3
+SELECT DAYOFWEEK(date) FROM t1;
+DAYOFWEEK(date)
+3
+SELECT * FROM v2;
+DAYOFWEEK(date)
+3
+SELECT DAYNAME('2005-09-06');
+DAYNAME('2005-09-06')
+Tuesday
+SELECT DAYNAME(date) FROM t1;
+DAYNAME(date)
+Tuesday
+SELECT * FROM v3;
+DAYNAME(date)
+Tuesday
+DROP TABLE t1;
+DROP VIEW  v1, v2, v3;

--- 1.106/mysql-test/t/view.test	2005-09-13 22:22:50 +04:00
+++ 1.107/mysql-test/t/view.test	2005-09-14 14:21:54 +04:00
@@ -760,12 +760,12 @@
 #
 # VIEWs with national characters
 #
-create table tü (cü char);
-create view vü as select cü from tü;
-insert into vü values ('ü');
-select * from vü;
-drop view vü;
-drop table tü;
+create table tü (cü char);
+create view vü as select cü from tü;
+insert into vü values ('ü');
+select * from vü;
+drop view vü;
+drop table tü;
 
 #
 # problem with used_tables() of outer reference resolved in VIEW
@@ -2077,3 +2077,34 @@
 select * from (select f1 as f2 from v1) v where v.f2='a';
 drop view v1;
 drop table t1;
+
+#
+# BUGs #12963, #13000: wrong creation of VIEW with WEEKDAY, DAYOFWEEK, and DAYNAME
+#
+
+CREATE TABLE t1 (date DATE NOT NULL);
+INSERT INTO  t1 VALUES ('2005-09-06');
+
+CREATE VIEW v1 AS SELECT WEEKDAY(date) FROM t1;
+SHOW CREATE VIEW v1;
+
+CREATE VIEW v2 AS SELECT DAYOFWEEK(date) FROM t1;
+SHOW CREATE VIEW v2;
+
+CREATE VIEW v3 AS SELECT DAYNAME(date) FROM t1;
+SHOW CREATE VIEW v3;
+
+SELECT WEEKDAY('2005-09-06');
+SELECT WEEKDAY(date) FROM t1;
+SELECT * FROM v1;
+
+SELECT DAYOFWEEK('2005-09-06');
+SELECT DAYOFWEEK(date) FROM t1;
+SELECT * FROM v2;
+
+SELECT DAYNAME('2005-09-06');
+SELECT DAYNAME(date) FROM t1;
+SELECT * FROM v3;
+
+DROP TABLE t1;
+DROP VIEW  v1, v2, v3;