Commit 7ff88ba7 authored by unknown's avatar unknown
Browse files

merge 


sql/item_sum.h:
  Auto merged
parents 8226e5fc be515e07

mysql-test/r/view.result

+7 −0
Original line number Diff line number Diff line
@@ -1850,6 +1850,13 @@ SELECT * FROM v1; 
SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1)

dkjhgd

drop view v1;

create table t1 (s1 int);

create view v1 as select var_samp(s1) from t1;

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select var_samp(`test`.`t1`.`s1`) AS `var_samp(s1)` from `test`.`t1`

drop view v1;

drop table t1;

set sql_mode='strict_all_tables';

CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB;

CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;

mysql-test/t/view.test

+9 −0
Original line number Diff line number Diff line
@@ -1697,6 +1697,15 @@ CREATE VIEW v1 AS SELECT SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1); 
SELECT * FROM v1;

drop view v1;



#

# Using var_samp with view (BUG#10651)

#

create table t1 (s1 int);

create view v1 as select var_samp(s1) from t1;

show create view v1;

drop view v1;

drop table t1;



#

# Correct inserting data check (absence of default value) for view

# underlying tables (BUG#6443)

sql/item_sum.h

+2 −1
Original line number Diff line number Diff line
@@ -479,7 +479,8 @@ class Item_sum_variance : public Item_sum_num 
  Item *result_item(Field *field)

  { return new Item_variance_field(this); }

  void no_rows_in_result() {}

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

  const char *func_name() const

    { return sample ? "var_samp(" : "variance("; }

  Item *copy_or_same(THD* thd);

  Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length);

  enum Item_result result_type () const { return hybrid_type; }