summaryrefslogtreecommitdiff
path: root/mysql-test/r/union.result
diff options
context:
space:
mode:
authormhansson/martin@linux-st28.site <>2007-03-22 14:58:43 +0100
committermhansson/martin@linux-st28.site <>2007-03-22 14:58:43 +0100
commit99ac24679d1fe289493f28b513210175cc60d075 (patch)
tree69a256e9c5b8769bc3d0ba824b9f02e237cd3f21 /mysql-test/r/union.result
parentcdf80a269bab2d5728fbabda3370e1e10ad77280 (diff)
downloadmariadb-git-99ac24679d1fe289493f28b513210175cc60d075.tar.gz
Bug#24791: Union with AVG-groups generates wrong results
Patch appled after doing a pull from the team tree. Additional tests had to be fixed
Diffstat (limited to 'mysql-test/r/union.result')
-rw-r--r--mysql-test/r/union.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index 8219d68a681..efdd8195fb5 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -554,7 +554,7 @@ aa
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `a` varbinary(20) NOT NULL default ''
+ `a` varbinary(2) NOT NULL default ''
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1 SELECT 12 as a UNION select 12.2 as a;
@@ -655,7 +655,7 @@ f
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
- `f` varbinary(24) default NULL
+ `f` varbinary(12) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1 SELECT y from t2 UNION select da from t2;