mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge kaamos.(none):/data/src/opt/bug33049/my50-bug33790
into kaamos.(none):/data/src/opt/bug33049/my51-bug33790 mysql-test/r/view.result: Auto merged sql/item_sum.cc: Auto merged mysql-test/t/view.test: Manual merge.
This commit is contained in:
@ -3629,6 +3629,14 @@ a
|
||||
1
|
||||
drop view v1, v2;
|
||||
drop table t1, t2;
|
||||
CREATE TABLE t1 (a INT);
|
||||
CREATE VIEW v1 AS SELECT p.a AS a FROM t1 p, t1 q;
|
||||
INSERT INTO t1 VALUES (1), (1);
|
||||
SELECT MAX(a), COUNT(DISTINCT a) FROM v1 GROUP BY a;
|
||||
MAX(a) COUNT(DISTINCT a)
|
||||
1 1
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
End of 5.0 tests.
|
||||
DROP DATABASE IF EXISTS `d-1`;
|
||||
CREATE DATABASE `d-1`;
|
||||
|
@ -3489,6 +3489,19 @@ execute stmt;
|
||||
drop view v1, v2;
|
||||
drop table t1, t2;
|
||||
|
||||
#
|
||||
# Bug #33049: Assert while running test-as3ap test(mysql-bench suite)
|
||||
#
|
||||
|
||||
CREATE TABLE t1 (a INT);
|
||||
CREATE VIEW v1 AS SELECT p.a AS a FROM t1 p, t1 q;
|
||||
|
||||
INSERT INTO t1 VALUES (1), (1);
|
||||
SELECT MAX(a), COUNT(DISTINCT a) FROM v1 GROUP BY a;
|
||||
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
|
||||
--echo End of 5.0 tests.
|
||||
|
||||
#
|
||||
@ -3562,4 +3575,3 @@ DROP TABLE t1;
|
||||
--echo
|
||||
|
||||
--echo End of 5.1 tests.
|
||||
|
||||
|
@ -601,6 +601,7 @@ Item_sum_hybrid::fix_fields(THD *thd, Item **ref)
|
||||
result_field=0;
|
||||
null_value=1;
|
||||
fix_length_and_dec();
|
||||
item= item->real_item();
|
||||
if (item->type() == Item::FIELD_ITEM)
|
||||
hybrid_field_type= ((Item_field*) item)->field->type();
|
||||
else
|
||||
|
Reference in New Issue
Block a user