From 9d7d3fb3a01c84f1b25d54426cf7c7c3e5afd7d2 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 1 Apr 2005 02:14:30 +0300 Subject: 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 --- mysql-test/r/group_by.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/group_by.result') 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 -- cgit v1.2.1