database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge

Browse Source 
sql/item_sum.h:
  Auto merged
This commit is contained in:
unknown
2005-07-05 11:21:47 +03:00
parent 8226e5fcbd be515e075c
commit 7ff88ba7a7
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/view.result
View File

@@ -1850,6 +1850,13 @@ SELECT * FROM v1;
SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1) SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1)
dkjhgd dkjhgd
drop view v1; 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'; set sql_mode='strict_all_tables';
CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB; CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB;
CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1; CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;

9
mysql-test/t/view.test
View File

@@ -1697,6 +1697,15 @@ CREATE VIEW v1 AS SELECT SUBSTRING_INDEX("dkjhgd:kjhdjh", ":", 1);
SELECT * FROM v1; SELECT * FROM v1;
drop view 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 # Correct inserting data check (absence of default value) for view
# underlying tables (BUG#6443) # underlying tables (BUG#6443)

3
sql/item_sum.h
View File

@@ -479,7 +479,8 @@ public:
Item *result_item(Field *field) Item *result_item(Field *field)
{ return new Item_variance_field(this); } { return new Item_variance_field(this); }
void no_rows_in_result() {} 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); Item *copy_or_same(THD* thd);
Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length); Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length);
enum Item_result result_type () const { return hybrid_type; } enum Item_result result_type () const { return hybrid_type; }