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 --- sql/sql_derived.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_derived.cc') diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 115974c3b05..45718e7c7da 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -115,7 +115,7 @@ int mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *orig_table_list) DBUG_RETURN(1); // out of memory // st_select_lex_unit::prepare correctly work for single select - if ((res= unit->prepare(thd, derived_result, 0, org_table_list->alias))) + if ((res= unit->prepare(thd, derived_result, 0, orig_table_list->alias))) goto exit; -- cgit v1.2.1