Commit d01927dc authored by unknown's avatar unknown
Browse files

Merge 


mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged
parents 997054eb de4fbc21

mysql-test/r/view.result

+5 −0
Original line number Diff line number Diff line
@@ -2205,6 +2205,11 @@ select * from (select f1 as f2 from v1) v where v.f2='a'; 
f2

drop view v1;

drop table t1;

create view v1 as SELECT CONVERT_TZ('2004-01-01 12:00:00','GMT','MET');

select * from v1;

CONVERT_TZ('2004-01-01 12:00:00','GMT','MET')

NULL

drop view v1;

CREATE TABLE t1 (date DATE NOT NULL);

INSERT INTO  t1 VALUES ('2005-09-06');

CREATE VIEW v1 AS SELECT DAYNAME(date) FROM t1;

mysql-test/t/view.test

+7 −0
Original line number Diff line number Diff line
@@ -2087,6 +2087,13 @@ select * from (select f1 as f2 from v1) v where v.f2='a'; 
drop view v1;

drop table t1;



#

# Bug #11416 Server crash if using a view that uses function convert_tz

#

create view v1 as SELECT CONVERT_TZ('2004-01-01 12:00:00','GMT','MET');

select * from v1;

drop view v1;



#

# Bugs #12963, #13000: wrong creation of VIEW with DAYNAME, DAYOFWEEK, and WEEKDAY

#

sql/sql_view.cc

+2 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,8 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table) 
ok2:

  if (arena)

    thd->restore_active_arena(arena, &backup);

  if (!old_lex->time_zone_tables_used && thd->lex->time_zone_tables_used)

    old_lex->time_zone_tables_used= thd->lex->time_zone_tables_used;

  thd->lex= old_lex;

  DBUG_RETURN(0);