Commit 50883340 authored by unknown's avatar unknown
Browse files

merge

parents da0c9d28 58adb70a

mysql-test/r/view.result

+5 −0
Original line number Diff line number Diff line
@@ -1826,3 +1826,8 @@ ERROR 42S21: Duplicate column name 's1' 
drop table t1;

create view v1(k, K) as select 1,2;

ERROR 42S21: Duplicate column name 'K'

create view v1 as SELECT TIME_FORMAT(SEC_TO_TIME(3600),'%H:%i') as t;

select * from v1;

t

01:00

drop view v1;

mysql-test/t/view.test

+8 −0
Original line number Diff line number Diff line
@@ -1599,6 +1599,7 @@ drop table t1; 
create view v1 as select cast(1 as decimal);

select * from v1;

drop view v1;



#

# Bug#11298 insert into select from VIEW produces incorrect result when 

#           using ORDER BY
@@ -1665,3 +1666,10 @@ drop table t1; 
# set names differ by case only

-- error 1060

create view v1(k, K) as select 1,2;



#

# using time_format in view (BUG#7521)

#

create view v1 as SELECT TIME_FORMAT(SEC_TO_TIME(3600),'%H:%i') as t;

select * from v1;

drop view v1;

sql/item_timefunc.h

+2 −1
Original line number Diff line number Diff line
@@ -503,7 +503,8 @@ class Item_func_date_format :public Item_str_func 
  Item_func_date_format(Item *a,Item *b,bool is_time_format_arg)

    :Item_str_func(a,b),is_time_format(is_time_format_arg) {}

  String *val_str(String *str);

  const char *func_name() const { return "date_format"; }

  const char *func_name() const

    { return is_time_format ? "time_format" : "date_format"; }

  void fix_length_and_dec();

  uint format_length(const String *format);

};