diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-04-01 02:14:30 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-04-01 02:14:30 +0300 |
| commit | 9d7d3fb3a01c84f1b25d54426cf7c7c3e5afd7d2 (patch) | |
| tree | bfd8839a822ffd9c3bcccaa970cc506139ae4a9c /mysql-test/r/group_by.result | |
| parent | 1938b873d5c46b4f95edada1da66c15720cc74d2 (diff) | |
| download | mariadb-git-9d7d3fb3a01c84f1b25d54426cf7c7c3e5afd7d2.tar.gz | |
postmerge 4.1->5.0 fixes
mysql-test/r/group_by.result:
result change
mysql-test/r/union.result:
result change
mysql-test/r/view.result:
result change
mysql-test/t/subselect.test:
fixed mistake of merge
sql/field.cc:
new 5.0 types support
temporary table/db names detection in field fixed
sql/field.h:
removed non-existent methods
added wrongly deleted during manual merge string
sql/item.cc:
support of new types added to merge of union types routines
sql/item.h:
fixed method definition
sql/item_cmpfunc.cc:
fixed type
sql/item_func.h:
item type name fixed
sql/item_subselect.cc:
added forgoten methods
sql/item_subselect.h:
fixed type
sql/sql_derived.cc:
fixed typo of manual merge
sql/sql_view.cc:
added new parameter
Diffstat (limited to 'mysql-test/r/group_by.result')
| -rw-r--r-- | mysql-test/r/group_by.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index 1c81878e5db..9ff1fbcb833 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -696,7 +696,7 @@ from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4; delete from t2 where a = 2 and b = 'val-2' limit 30; explain select c from t2 where a = 2 and b = 'val-2' group by c; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ref PRIMARY,a PRIMARY 400 const,const 6 Using where +1 SIMPLE t2 ref PRIMARY,a PRIMARY 402 const,const 6 Using where select c from t2 where a = 2 and b = 'val-2' group by c; c val-74 |